summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chih-Hung Hsieh <chh@google.com> 2016-05-27 18:09:49 +0000
committer android-build-merger <android-build-merger@google.com> 2016-05-27 18:09:49 +0000
commitcfae35a4007316cdff280ecce3d71d8d6074bccc (patch)
tree90de6d4715ad1b2e9717a70309833012ebec5d5e
parentf1187008c1ca7252b42f7334afcf3fc7abe126f2 (diff)
parentd439efc361535701f6d2d0b82cfa22b9d4a5898b (diff)
Merge "Fix misc-macro-parentheses warnings in DngCreator."
am: d439efc361 * commit 'd439efc361535701f6d2d0b82cfa22b9d4a5898b': Fix misc-macro-parentheses warnings in DngCreator. Change-Id: I5fd1127ff3efde3b44ac6d358d48665f89d54e01
-rw-r--r--core/jni/android_hardware_camera2_DngCreator.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/android_hardware_camera2_DngCreator.cpp b/core/jni/android_hardware_camera2_DngCreator.cpp
index cb0abb6bfaa8..0fd5ffc2bdb9 100644
--- 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; \