drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 91ff3c18: am 7d3f9e97: Merge "Fix for native leaks in YuvToJpegEncoder.cpp"

Browse Source 
* commit '91ff3c18dbb61ed0087f741dd2bdf911ecf42fef':
  Fix for native leaks in YuvToJpegEncoder.cpp
This commit is contained in:
Elliott Hughes
2014-04-30 19:07:01 +00:00
committed by Android Git Automerger
parent 21ccb07fbe 91ff3c18db
commit f84493ec95
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/jni/android/graphics/YuvToJpegEncoder.cpp
View File

@ -226,16 +226,17 @@ static jboolean YuvImage_compressToJpeg(JNIEnv* env, jobject, jbyteArray inYuv,
jint* imgOffsets = env->GetIntArrayElements(offsets, NULL);
jint* imgStrides = env->GetIntArrayElements(strides, NULL);
YuvToJpegEncoder* encoder = YuvToJpegEncoder::create(format, imgStrides);
if (encoder == NULL) {
return JNI_FALSE;
jboolean result = JNI_FALSE;
if (encoder != NULL) {
encoder->encode(strm, yuv, width, height, imgOffsets, jpegQuality);
delete encoder;
result = JNI_TRUE;
}
encoder->encode(strm, yuv, width, height, imgOffsets, jpegQuality);
delete encoder;
env->ReleaseByteArrayElements(inYuv, yuv, 0);
env->ReleaseIntArrayElements(offsets, imgOffsets, 0);
env->ReleaseIntArrayElements(strides, imgStrides, 0);
return JNI_TRUE;
return result;
}
///////////////////////////////////////////////////////////////////////////////