diff options
author | Nick Kralevich <nnk@google.com> | 2013-12-06 10:47:35 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-12-06 10:47:35 -0800 |
commit | 044648be152a8914d68c4952dae2694dd43460da (patch) | |
tree | f643667c491836bf19da1d1316796eb70932835f /jni | |
parent | bb23e198873a6e63c34b52fe3d1f12d3e5d13a2c (diff) | |
parent | 062bd465cd25806ea37200639c6b1200a62db9d4 (diff) | |
download | android_packages_apps_Gallery2-044648be152a8914d68c4952dae2694dd43460da.tar.gz android_packages_apps_Gallery2-044648be152a8914d68c4952dae2694dd43460da.tar.bz2 android_packages_apps_Gallery2-044648be152a8914d68c4952dae2694dd43460da.zip |
am 062bd465: Merge "jni: fix C99 inline linking"
* commit '062bd465cd25806ea37200639c6b1200a62db9d4':
jni: fix C99 inline linking
Diffstat (limited to 'jni')
-rw-r--r-- | jni/filters/geometry.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/jni/filters/geometry.c b/jni/filters/geometry.c index a0b5aaacf..b308213c6 100644 --- 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,7 +70,7 @@ __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; @@ -86,17 +86,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 +113,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; |