Merge "Fix misc-macro-parentheses warnings in DngCreator." am: d439efc361

am: cfae35a400 * commit 'cfae35a4007316cdff280ecce3d71d8d6074bccc': Fix misc-macro-parentheses warnings in DngCreator. Change-Id: I0e6297b1e2182d4209bf6744e9d35e574883d7da
2016-05-27 18:16:02 +00:00
parent 90045710ca cfae35a400
commit 86f5b560af
1 changed files with 1 additions and 1 deletions
--- a/core/jni/android_hardware_camera2_DngCreator.cpp
+++ b/core/jni/android_hardware_camera2_DngCreator.cpp
@@ -74,7 +74,7 @@ using namespace img_utils;
    }

 #define BAIL_IF_EMPTY_RET_NULL_SP(entry, jnienv, tagId, writer) \
-    if (entry.count == 0) { \
+    if ((entry).count == 0) { \
        jniThrowExceptionFmt(jnienv, "java/lang/IllegalArgumentException", \
                "Missing metadata fields for tag %s (%x)", (writer)->getTagName(tagId), (tagId)); \
        return nullptr; \