Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8dfa3a7c authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh Committed by Arne Coucheron
Browse files

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
parent 02de8aaf

jni/filters/filters.h

+6 −6
Original line number Original line Diff line number Diff line
@@ -25,23 +25,23 @@ 




typedef unsigned int Color;

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 GetA(color) (((color) >> 24) & 0xFF)

#define GetB(color) (((color) >> 16) & 0xFF)

#define GetB(color) (((color) >> 16) & 0xFF)

#define GetG(color) (((color) >> 8) & 0xFF)

#define GetG(color) (((color) >> 8) & 0xFF)

#define GetR(color) (((color) >> 0) & 0xFF)

#define GetR(color) (((color) >> 0) & 0xFF)





#define MIN(a, b) (a < b ? a : b)

#define MIN(a, b) ((a) < (b) ? (a) : (b))

#define MAX(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 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 JNIFUNCF(cls, name, vars...) Java_com_android_gallery3d_filtershow_filters_ ## cls ## _ ## name(JNIEnv* env, jobject obj, vars)





#define RED i

#define RED i

#define GREEN i+1

#define GREEN (i+1)

#define BLUE i+2

#define BLUE (i+2)

#define ALPHA i+3

#define ALPHA (i+3)

#define CLAMP(c) (MAX(0, MIN(255, c)))

#define CLAMP(c) (MAX(0, MIN(255, c)))





__inline__ unsigned char  clamp(int c)

__inline__ unsigned char  clamp(int c)

jni_jpegstream/src/error_codes.h

+4 −4
Original line number Original line Diff line number Diff line
@@ -17,10 +17,10 @@ 
#ifndef JPEG_ERROR_CODES_H_

#ifndef JPEG_ERROR_CODES_H_

#define JPEG_ERROR_CODES_H_

#define JPEG_ERROR_CODES_H_





#define J_DONE                    -4

#define J_DONE                    (-4)

#define J_EXCEPTION               -3

#define J_EXCEPTION               (-3)

#define J_ERROR_BAD_ARGS          -2

#define J_ERROR_BAD_ARGS          (-2)

#define J_ERROR_FATAL             -1

#define J_ERROR_FATAL             (-1)

#define J_SUCCESS                 0

#define J_SUCCESS                 0





#endif // JPEG_ERROR_CODES_H_
 
#endif // JPEG_ERROR_CODES_H_