commit 4ba4caede125ff602b0d93f577f9054a07791ff7
author Jean-Baptiste Queru <jbq@google.com> Wed Aug 29 11:27:31 2012 -0700
committer android code review <noreply-gerritcodereview@google.com> Wed Aug 29 11:27:31 2012 -0700
tree ec56f1a60b1e56494f369791c8961c196de76329
parent 0e0942c7209c758bc00939ae54059dc24bce3abb
parent 35ef567140e42f354be4a98cce6a7666ac085c13

Merge "Fix SkBitmap::fPixels not being locked correctly"

core/jni/android/graphics/Bitmap.cpp

diff --git a/core/jni/android/graphics/Bitmap.cpp b/core/jni/android/graphics/Bitmap.cpp
index 3c27caf..1bba5b4 100644
--- a/core/jni/android/graphics/Bitmap.cpp
+++ b/core/jni/android/graphics/Bitmap.cpp
@@ -298,8 +298,18 @@
     }

 

     bool success = false;

-    SkWStream* strm = CreateJavaOutputStreamAdaptor(env, jstream, jstorage);

-    if (NULL != strm) {

+    if (NULL != bitmap) {

+        SkAutoLockPixels alp(*bitmap);

+

+        if (NULL == bitmap->getPixels()) {

+            return false;

+        }

+

+        SkWStream* strm = CreateJavaOutputStreamAdaptor(env, jstream, jstorage);

+        if (NULL == strm) {

+            return false;

+        }

+

         SkImageEncoder* encoder = SkImageEncoder::Create(fm);

         if (NULL != encoder) {

             success = encoder->encodeStream(strm, *bitmap, quality);