Merge "Fix misc-macro-parentheses warnings in Gallery2."
diff --git a/jni/filters/filters.h b/jni/filters/filters.h
index 14b69cd..af40536 100644
--- a/jni/filters/filters.h
+++ b/jni/filters/filters.h
@@ -24,23 +24,23 @@
typedef unsigned int Color;
-#define SetColor(a, r, g, b) ((a << 24) | (b << 16) | (g << 8) | (r << 0));
+#define SetColor(a, r, g, b) (((a) << 24) | ((b) << 16) | ((g) << 8) | ((r) << 0));
#define GetA(color) (((color) >> 24) & 0xFF)
#define GetB(color) (((color) >> 16) & 0xFF)
#define GetG(color) (((color) >> 8) & 0xFF)
#define GetR(color) (((color) >> 0) & 0xFF)
-#define MIN(a, b) (a < b ? a : b)
-#define MAX(a, b) (a > b ? a : b)
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
+#define MAX(a, b) ((a) > (b) ? (a) : (b))
#define LOG(msg...) __android_log_print(ANDROID_LOG_VERBOSE, "NativeFilters", msg)
#define JNIFUNCF(cls, name, vars...) Java_com_android_gallery3d_filtershow_filters_ ## cls ## _ ## name(JNIEnv* env, jobject obj, vars)
#define RED i
-#define GREEN i+1
-#define BLUE i+2
-#define ALPHA i+3
+#define GREEN (i+1)
+#define BLUE (i+2)
+#define ALPHA (i+3)
#define CLAMP(c) (MAX(0, MIN(255, c)))
__inline__ unsigned char clamp(int c);
diff --git a/jni_jpegstream/src/error_codes.h b/jni_jpegstream/src/error_codes.h
index be55a00..f224b4a 100644
--- a/jni_jpegstream/src/error_codes.h
+++ b/jni_jpegstream/src/error_codes.h
@@ -17,10 +17,10 @@
#ifndef JPEG_ERROR_CODES_H_
#define JPEG_ERROR_CODES_H_
-#define J_DONE -4
-#define J_EXCEPTION -3
-#define J_ERROR_BAD_ARGS -2
-#define J_ERROR_FATAL -1
+#define J_DONE (-4)
+#define J_EXCEPTION (-3)
+#define J_ERROR_BAD_ARGS (-2)
+#define J_ERROR_FATAL (-1)
#define J_SUCCESS 0
#endif // JPEG_ERROR_CODES_H_
