diff options
Diffstat (limited to 'jni/filters/geometry.c')
-rw-r--r-- | jni/filters/geometry.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/jni/filters/geometry.c b/jni/filters/geometry.c index b308213c6..9fbf7334c 100644 --- a/jni/filters/geometry.c +++ b/jni/filters/geometry.c @@ -19,6 +19,8 @@ static __inline__ void flipVertical(char * source, int srcWidth, int srcHeight, char * destination, int dstWidth, int dstHeight){ //Vertical + (void)dstWidth; + (void)dstHeight; size_t cpy_bytes = sizeof(char) * 4; int width = cpy_bytes * srcWidth; int length = srcHeight; @@ -33,6 +35,8 @@ static __inline__ void flipVertical(char * source, int srcWidth, int srcHeight, static __inline__ void flipHorizontal(char * source, int srcWidth, int srcHeight, char * destination, int dstWidth, int dstHeight){ //Horizontal + (void)dstWidth; + (void)dstHeight; size_t cpy_bytes = sizeof(char) * 4; int width = cpy_bytes * srcWidth; int length = srcHeight; @@ -71,12 +75,13 @@ static __inline__ void flip_fun(int flip, char * source, int srcWidth, int srcHe //90 CCW (opposite of what's used in UI?) static __inline__ void rotate90(char * source, int srcWidth, int srcHeight, char * destination, int dstWidth, int dstHeight){ + (void)dstWidth; + (void)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; + unsigned int j = 0; for (j = 0; j < length * cpy_bytes; j+= cpy_bytes){ for (i = 0; i < width; i+=cpy_bytes){ int column_disp = (width - cpy_bytes - i) * length; @@ -120,7 +125,6 @@ static __inline__ void crop(char * source, int srcWidth, int srcHeight, char * d if ((srcWidth > dstWidth + offsetWidth) || (srcHeight > dstHeight + offsetHeight)){ return; } - int i = 0; int j = 0; for (j = offsetHeight; j < offsetHeight + dstHeight; j++){ memcpy(destination + (j - offsetHeight) * new_row_width, source + j * row_width + offsetWidth * cpy_bytes, cpy_bytes * dstWidth ); @@ -128,6 +132,7 @@ static __inline__ void crop(char * source, int srcWidth, int srcHeight, char * d } void JNIFUNCF(ImageFilterGeometry, nativeApplyFilterFlip, jobject src, jint srcWidth, jint srcHeight, jobject dst, jint dstWidth, jint dstHeight, jint flip) { + (void)obj; char* destination = 0; char* source = 0; if (srcWidth != dstWidth || srcHeight != dstHeight) { @@ -141,9 +146,9 @@ void JNIFUNCF(ImageFilterGeometry, nativeApplyFilterFlip, jobject src, jint srcW } void JNIFUNCF(ImageFilterGeometry, nativeApplyFilterRotate, jobject src, jint srcWidth, jint srcHeight, jobject dst, jint dstWidth, jint dstHeight, jint rotate) { + (void)obj; char* destination = 0; char* source = 0; - int len = dstWidth * dstHeight * 4; AndroidBitmap_lockPixels(env, src, (void**) &source); AndroidBitmap_lockPixels(env, dst, (void**) &destination); rotate_fun(rotate, source, srcWidth, srcHeight, destination, dstWidth, dstHeight); @@ -152,9 +157,9 @@ void JNIFUNCF(ImageFilterGeometry, nativeApplyFilterRotate, jobject src, jint sr } void JNIFUNCF(ImageFilterGeometry, nativeApplyFilterCrop, jobject src, jint srcWidth, jint srcHeight, jobject dst, jint dstWidth, jint dstHeight, jint offsetWidth, jint offsetHeight) { + (void)obj; char* destination = 0; char* source = 0; - int len = dstWidth * dstHeight * 4; AndroidBitmap_lockPixels(env, src, (void**) &source); AndroidBitmap_lockPixels(env, dst, (void**) &destination); crop(source, srcWidth, srcHeight, destination, dstWidth, dstHeight, offsetWidth, offsetHeight); @@ -163,6 +168,10 @@ void JNIFUNCF(ImageFilterGeometry, nativeApplyFilterCrop, jobject src, jint srcW } void JNIFUNCF(ImageFilterGeometry, nativeApplyFilterStraighten, jobject src, jint srcWidth, jint srcHeight, jobject dst, jint dstWidth, jint dstHeight, jfloat straightenAngle) { + (void)obj; + (void)srcWidth; + (void)srcHeight; + (void)straightenAngle; char* destination = 0; char* source = 0; int len = dstWidth * dstHeight * 4; @@ -171,9 +180,7 @@ void JNIFUNCF(ImageFilterGeometry, nativeApplyFilterStraighten, jobject src, jin // TODO: implement straighten int i = 0; for (; i < len; i += 4) { - int r = source[RED]; int g = source[GREEN]; - int b = source[BLUE]; destination[RED] = 128; destination[GREEN] = g; destination[BLUE] = 128; |