From 8dfa3a7cc79cf04769e57b1e997afade7799a966 Mon Sep 17 00:00:00 2001 From: Chih-Hung Hsieh Date: Wed, 29 Jun 2016 11:42:46 -0700 Subject: Fix misc-macro-parentheses warnings in Gallery2. Add parentheses around negative literals and parameters beside operators. Bug: 28705665 Test: build with clang-tidy Change-Id: Icdb2d003e77f6b0dfac7d9c30dec0ee80c13e3cd --- jni/filters/filters.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'jni') diff --git a/jni/filters/filters.h b/jni/filters/filters.h index 55c260f06..a46b3cedc 100644 --- a/jni/filters/filters.h +++ b/jni/filters/filters.h @@ -25,23 +25,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) -- cgit v1.2.3