diff options
| author | Dan Albert <danalbert@google.com> | 2016-07-26 15:05:35 -0700 |
|---|---|---|
| committer | Michael Bestas <mkbestas@lineageos.org> | 2020-05-27 00:06:11 +0300 |
| commit | ff433d3966f6ccb5924489d0d92d49095ee95dca (patch) | |
| tree | e9c25a5741f05a6b64371eb3c05484c2377c1b5e | |
| parent | cc7a2af51b49088bfa0a77dd919e4d8bd521afdc (diff) | |
| download | android_packages_apps_Gallery2-ff433d3966f6ccb5924489d0d92d49095ee95dca.tar.gz android_packages_apps_Gallery2-ff433d3966f6ccb5924489d0d92d49095ee95dca.tar.bz2 android_packages_apps_Gallery2-ff433d3966f6ccb5924489d0d92d49095ee95dca.zip | |
Cleanup warnings in jni.
Test: mma
Change-Id: I1a3997525427258d628a7c59528c758070ab5f82
| -rw-r--r-- | jni/Android.mk | 4 | ||||
| -rw-r--r-- | jni/filters/filters.h | 5 | ||||
| -rw-r--r-- | jni/filters/geometry.c | 6 | ||||
| -rw-r--r-- | jni/filters/wbalance.c | 8 |
4 files changed, 10 insertions, 13 deletions
diff --git a/jni/Android.mk b/jni/Android.mk index e9c1ec31b..0c4018d67 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 @@ -47,7 +47,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 a63ef2097..6856a2616 100644 --- a/jni/filters/filters.h +++ b/jni/filters/filters.h @@ -19,7 +19,6 @@ #include <jni.h> #include <string.h> -#include <stdlib.h> #include <android/log.h> #include <android/bitmap.h> @@ -44,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 a0e77ef14..b01e5e05f 100644 --- a/jni/filters/geometry.c +++ b/jni/filters/geometry.c @@ -77,10 +77,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 9a2156166..99a7d2e0d 100644 --- a/jni/filters/wbalance.c +++ b/jni/filters/wbalance.c @@ -101,10 +101,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; |