commit ca1265e26fcfaae53e0f4dd9d3aa0023158305dc
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Dec 04 21:03:22 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Dec 04 21:03:22 2017 +0000
tree d1c347b8b3c03db1ec66b3600b9c9b369f4fb781
parent bf27f7dac3bf1d6199ad00caf2c228c7dc3a985f
parent 471ef097cc85de24bea28dc5fbec5aec18532317

Merge "Stop using skjpeg_error_mgr in YuvToJpegEncoder"

core/jni/android/graphics/YuvToJpegEncoder.cpp

diff --git a/core/jni/android/graphics/YuvToJpegEncoder.cpp b/core/jni/android/graphics/YuvToJpegEncoder.cpp
index 31567f7..5eecd9c 100644
--- a/core/jni/android/graphics/YuvToJpegEncoder.cpp
+++ b/core/jni/android/graphics/YuvToJpegEncoder.cpp
@@ -26,12 +26,13 @@
 bool YuvToJpegEncoder::encode(SkWStream* stream, void* inYuv, int width,
         int height, int* offsets, int jpegQuality) {
     jpeg_compress_struct    cinfo;
-    skjpeg_error_mgr        sk_err;
+    jpeg_error_mgr          err;
     skjpeg_destination_mgr  sk_wstream(stream);
 
-    cinfo.err = jpeg_std_error(&sk_err);
-    sk_err.error_exit = skjpeg_error_exit;
-    if (setjmp(sk_err.fJmpBuf)) {
+    cinfo.err = jpeg_std_error(&err);
+    err.error_exit = skjpeg_error_exit;
+    jmp_buf jmp;
+    if (setjmp(jmp)) {
         return false;
     }
     jpeg_create_compress(&cinfo);