Merge "Decoder only returns true on complete success." into lmp-mr1-dev

2014-10-22 21:53:03 +00:00
parent 4329f15b50 14494262d3
commit 36960fad66
1 changed files with 2 additions and 1 deletions
--- a/core/jni/android/graphics/BitmapFactory.cpp
+++ b/core/jni/android/graphics/BitmapFactory.cpp
@@ -315,7 +315,8 @@ static jobject doDecode(JNIEnv* env, SkStreamRewindable* stream, jobject padding
    }

    SkBitmap decodingBitmap;
-    if (!decoder->decode(stream, &decodingBitmap, prefColorType, decodeMode)) {
+    if (decoder->decode(stream, &decodingBitmap, prefColorType, decodeMode)
+                != SkImageDecoder::kSuccess) {
        return nullObjectReturn("decoder->decode returned false");
    }