Cleanup warnings in jni.

[android-x86/packages-apps-Gallery2.git] / jni / filters / geometry.c

diff --git a/jni/filters/geometry.c b/jni/filters/geometry.c
index a0b5aaa..84a044c 100644 (file)
--- a/jni/filters/geometry.c
+++ b/jni/filters/geometry.c
@@ -17,7 +17,7 @@
 #include "filters.h"
 #include <stdio.h>
 
-__inline__ void flipVertical(char * source, int srcWidth, int srcHeight, char * destination, int dstWidth, int dstHeight){
+static __inline__ void flipVertical(char * source, int srcWidth, int srcHeight, char * destination, int dstWidth, int dstHeight){
     //Vertical
     size_t cpy_bytes = sizeof(char) * 4;
     int width = cpy_bytes * srcWidth;
@@ -31,7 +31,7 @@ __inline__ void flipVertical(char * source, int srcWidth, int srcHeight, char *
     }
 }
 
-__inline__ void flipHorizontal(char * source, int srcWidth, int srcHeight, char * destination, int dstWidth, int dstHeight){
+static __inline__ void flipHorizontal(char * source, int srcWidth, int srcHeight, char * destination, int dstWidth, int dstHeight){
     //Horizontal
     size_t cpy_bytes = sizeof(char) * 4;
     int width = cpy_bytes * srcWidth;
@@ -48,7 +48,7 @@ __inline__ void flipHorizontal(char * source, int srcWidth, int srcHeight, char
     }
 }
 
-__inline__ void flip_fun(int flip, char * source, int srcWidth, int srcHeight, char * destination, int dstWidth, int dstHeight){
+static __inline__ void flip_fun(int flip, char * source, int srcWidth, int srcHeight, char * destination, int dstWidth, int dstHeight){
     int horiz = (flip & 1) != 0;
     int vert = (flip & 2) != 0;
     if (horiz && vert){
@@ -70,15 +70,13 @@ __inline__ void flip_fun(int flip, char * source, int srcWidth, int srcHeight, c
 }
 
 //90 CCW (opposite of what's used in UI?)
-__inline__ void rotate90(char * source, int srcWidth, int srcHeight, char * destination, int dstWidth, int dstHeight){
+static __inline__ void rotate90(char * source, int srcWidth, int srcHeight, char * destination, int dstWidth, int dstHeight){
     size_t cpy_bytes = sizeof(char) * 4;
     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);
@@ -86,17 +84,17 @@ __inline__ void rotate90(char * source, int srcWidth, int srcHeight, char * dest
     }
 }
 
-__inline__ void rotate180(char * source, int srcWidth, int srcHeight, char * destination, int dstWidth, int dstHeight){
+static __inline__ void rotate180(char * source, int srcWidth, int srcHeight, char * destination, int dstWidth, int dstHeight){
     flip_fun(3, source, srcWidth, srcHeight, destination, dstWidth, dstHeight);
 }
 
-__inline__ void rotate270(char * source, int srcWidth, int srcHeight, char * destination, int dstWidth, int dstHeight){
+static __inline__ void rotate270(char * source, int srcWidth, int srcHeight, char * destination, int dstWidth, int dstHeight){
     rotate90(source, srcWidth, srcHeight, destination, dstWidth, dstHeight);
     flip_fun(3, destination, dstWidth, dstHeight, destination, dstWidth, dstHeight);
 }
 
 // rotate == 1 is 90 degrees, 2 is 180, 3 is 270 (positive is CCW).
-__inline__ void rotate_fun(int rotate, char * source, int srcWidth, int srcHeight, char * destination, int dstWidth, int dstHeight){
+static __inline__ void rotate_fun(int rotate, char * source, int srcWidth, int srcHeight, char * destination, int dstWidth, int dstHeight){
     switch( rotate )
     {
         case 1:
@@ -113,7 +111,7 @@ __inline__ void rotate_fun(int rotate, char * source, int srcWidth, int srcHeigh
     }
 }
 
-__inline__ void crop(char * source, int srcWidth, int srcHeight, char * destination, int dstWidth, int dstHeight, int offsetWidth, int offsetHeight){
+static __inline__ void crop(char * source, int srcWidth, int srcHeight, char * destination, int dstWidth, int dstHeight, int offsetWidth, int offsetHeight){
     size_t cpy_bytes = sizeof(char) * 4;
     int row_width = cpy_bytes * srcWidth;
     int new_row_width = cpy_bytes * dstWidth;