diff options
| author | Dan Albert <danalbert@google.com> | 2016-07-26 15:05:35 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2016-07-27 10:35:17 -0700 |
| commit | fb7f4481a1d6ded32bc3a29d7683cd90bf24b2fc (patch) | |
| tree | 4bc6f16eeec4e4370fc28afba8094c277cbf2597 /jni | |
| parent | 67d7daa7b3e57771f2d7e31dd69254a9839e9177 (diff) | |
| download | android_packages_apps_Gallery2-fb7f4481a1d6ded32bc3a29d7683cd90bf24b2fc.tar.gz android_packages_apps_Gallery2-fb7f4481a1d6ded32bc3a29d7683cd90bf24b2fc.tar.bz2 android_packages_apps_Gallery2-fb7f4481a1d6ded32bc3a29d7683cd90bf24b2fc.zip | |
Cleanup warnings in jni.
Test: mma
Change-Id: I1a3997525427258d628a7c59528c758070ab5f82
Diffstat (limited to 'jni')
| -rw-r--r-- | jni/Android.mk | 4 | ||||
| -rw-r--r-- | jni/filters/filters.h | 4 | ||||
| -rw-r--r-- | jni/filters/geometry.c | 6 | ||||
| -rw-r--r-- | jni/filters/wbalance.c | 8 |
4 files changed, 10 insertions, 12 deletions
diff --git a/jni/Android.mk b/jni/Android.mk index 2d7a0c398..857fca243 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -2,7 +2,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_CFLAGS += -DEGL_EGLEXT_PROTOTYPES +LOCAL_CFLAGS += -DEGL_EGLEXT_PROTOTYPES -Wno-unused-parameter LOCAL_SRC_FILES := jni_egl_fence.cpp @@ -44,7 +44,7 @@ LOCAL_SRC_FILES := filters/gradient.c \ filters/tinyplanet.cc \ filters/kmeans.cc -LOCAL_CFLAGS += -ffast-math -O3 -funroll-loops +LOCAL_CFLAGS += -ffast-math -O3 -funroll-loops -Wno-unused-parameter LOCAL_LDLIBS := -llog -ljnigraphics LOCAL_ARM_MODE := arm diff --git a/jni/filters/filters.h b/jni/filters/filters.h index af40536e4..6856a2616 100644 --- a/jni/filters/filters.h +++ b/jni/filters/filters.h @@ -43,8 +43,8 @@ typedef unsigned int Color; #define ALPHA (i+3) #define CLAMP(c) (MAX(0, MIN(255, c))) -__inline__ unsigned char clamp(int c); -__inline__ int clampMax(int c,int max); +extern unsigned char clamp(int c); +extern int clampMax(int c,int max); extern void rgb2hsv( unsigned char *rgb,int rgbOff,unsigned short *hsv,int hsvOff); extern void hsv2rgb(unsigned short *hsv,int hsvOff,unsigned char *rgb,int rgbOff); diff --git a/jni/filters/geometry.c b/jni/filters/geometry.c index b308213c6..84a044c5a 100644 --- a/jni/filters/geometry.c +++ b/jni/filters/geometry.c @@ -75,10 +75,8 @@ static __inline__ void rotate90(char * source, int srcWidth, int srcHeight, char int width = cpy_bytes * srcWidth; int length = srcHeight; int total = length * width; - int i = 0; - int j = 0; - for (j = 0; j < length * cpy_bytes; j+= cpy_bytes){ - for (i = 0; i < width; i+=cpy_bytes){ + for (size_t j = 0; j < length * cpy_bytes; j+= cpy_bytes){ + for (int i = 0; i < width; i+=cpy_bytes){ int column_disp = (width - cpy_bytes - i) * length; int row_disp = j; memcpy(destination + column_disp + row_disp , source + j * srcWidth + i, cpy_bytes); diff --git a/jni/filters/wbalance.c b/jni/filters/wbalance.c index 2b92b9978..7592a427d 100644 --- a/jni/filters/wbalance.c +++ b/jni/filters/wbalance.c @@ -99,10 +99,10 @@ void estmateWhite(unsigned char *src, int len, int *wr, int *wb, int *wg){ } void estmateWhiteBox(unsigned char *src, int iw, int ih, int x,int y, int *wr, int *wb, int *wg){ - int r; - int g; - int b; - int sum; + int r = 0; + int g = 0; + int b = 0; + int sum = 0; int xp,yp; int bounds = 5; if (x<0) x = bounds; |