commit 685d1d8acc8e8a8d618daafd086415a634c1bcd6
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jul 27 18:35:09 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jul 27 18:35:09 2016 +0000
tree 4bc6f16eeec4e4370fc28afba8094c277cbf2597
parent 67d7daa7b3e57771f2d7e31dd69254a9839e9177
parent fb7f4481a1d6ded32bc3a29d7683cd90bf24b2fc

Merge "Cleanup warnings in jni."

jni/Android.mk

diff --git a/jni/Android.mk b/jni/Android.mk
index 2d7a0c3..857fca2 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -2,7 +2,7 @@
 
 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 @@
                    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
 

jni/filters/filters.h

diff --git a/jni/filters/filters.h b/jni/filters/filters.h
index af40536..6856a26 100644
--- a/jni/filters/filters.h
+++ b/jni/filters/filters.h
@@ -43,8 +43,8 @@
 #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);

jni/filters/geometry.c

diff --git a/jni/filters/geometry.c b/jni/filters/geometry.c
index b308213..84a044c 100644
--- a/jni/filters/geometry.c
+++ b/jni/filters/geometry.c
@@ -75,10 +75,8 @@
     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);

jni/filters/wbalance.c

diff --git a/jni/filters/wbalance.c b/jni/filters/wbalance.c
index 2b92b99..7592a42 100644
--- a/jni/filters/wbalance.c
+++ b/jni/filters/wbalance.c
@@ -99,10 +99,10 @@
 }
 
 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;