summaryrefslogtreecommitdiffstats
path: root/core/jni/android
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-11-12 02:53:35 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-12 02:53:35 +0000
commit5b6683c04a56548dbc041dda0a66a2b67444f634 (patch)
treead7d292c885d714e6ccab04321ef06d0e989b771 /core/jni/android
parent6f4c0f8e9f07dc67cd72f9613cb6d72b9edb7f86 (diff)
parent34acb4c8d4abe1c4f580b85ddc84b18b7e38e417 (diff)
downloadframeworks_base-5b6683c04a56548dbc041dda0a66a2b67444f634.zip
frameworks_base-5b6683c04a56548dbc041dda0a66a2b67444f634.tar.gz
frameworks_base-5b6683c04a56548dbc041dda0a66a2b67444f634.tar.bz2
am 34acb4c8: Merge "Prevent resource leak in YuvToJpegEncoder"
* commit '34acb4c8d4abe1c4f580b85ddc84b18b7e38e417': Prevent resource leak in YuvToJpegEncoder
Diffstat (limited to 'core/jni/android')
-rw-r--r--core/jni/android/graphics/YuvToJpegEncoder.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/jni/android/graphics/YuvToJpegEncoder.cpp b/core/jni/android/graphics/YuvToJpegEncoder.cpp
index 6591d60..9b2e4b5 100644
--- a/core/jni/android/graphics/YuvToJpegEncoder.cpp
+++ b/core/jni/android/graphics/YuvToJpegEncoder.cpp
@@ -236,6 +236,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);
+ delete strm;
return result;
}
///////////////////////////////////////////////////////////////////////////////