From 39029b29906fb064fc1e408983809b9b7ad74095 Mon Sep 17 00:00:00 2001 From: Ashok Bhat Date: Fri, 10 Jan 2014 16:24:38 +0000 Subject: [PATCH] Make YuvToJpegEncoder more JNI compliant Minor changes have been done to conform with standard JNI practice (e.g. use of jint instead of int in JNI function prototypes) Change-Id: I4015138921cc18ecae52daaa6710b3c9efd68e87 Signed-off-by: Ashok Bhat Signed-off-by: Marcus Oakland --- core/jni/android/graphics/YuvToJpegEncoder.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/jni/android/graphics/YuvToJpegEncoder.cpp b/core/jni/android/graphics/YuvToJpegEncoder.cpp index f3869058230b5..799782d53ce22 100644 --- a/core/jni/android/graphics/YuvToJpegEncoder.cpp +++ b/core/jni/android/graphics/YuvToJpegEncoder.cpp @@ -217,8 +217,8 @@ void Yuv422IToJpegEncoder::configSamplingFactors(jpeg_compress_struct* cinfo) { /////////////////////////////////////////////////////////////////////////////// static jboolean YuvImage_compressToJpeg(JNIEnv* env, jobject, jbyteArray inYuv, - int format, int width, int height, jintArray offsets, - jintArray strides, int jpegQuality, jobject jstream, + jint format, jint width, jint height, jintArray offsets, + jintArray strides, jint jpegQuality, jobject jstream, jbyteArray jstorage) { jbyte* yuv = env->GetByteArrayElements(inYuv, NULL); SkWStream* strm = CreateJavaOutputStreamAdaptor(env, jstream, jstorage); @@ -227,7 +227,7 @@ static jboolean YuvImage_compressToJpeg(JNIEnv* env, jobject, jbyteArray inYuv, jint* imgStrides = env->GetIntArrayElements(strides, NULL); YuvToJpegEncoder* encoder = YuvToJpegEncoder::create(format, imgStrides); if (encoder == NULL) { - return false; + return JNI_FALSE; } encoder->encode(strm, yuv, width, height, imgOffsets, jpegQuality); @@ -235,7 +235,7 @@ static jboolean YuvImage_compressToJpeg(JNIEnv* env, jobject, jbyteArray inYuv, env->ReleaseByteArrayElements(inYuv, yuv, 0); env->ReleaseIntArrayElements(offsets, imgOffsets, 0); env->ReleaseIntArrayElements(strides, imgStrides, 0); - return true; + return JNI_TRUE; } ///////////////////////////////////////////////////////////////////////////////