diff options
| author | Leon Scroggins III <scroggo@google.com> | 2014-10-22 21:53:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-22 21:53:07 +0000 |
| commit | 36960fad6631f3cb5f2c6048e482e19319b6b2d3 (patch) | |
| tree | dda78e82517147b7fbc50fac670e6a8153ec4eb3 /core/jni | |
| parent | 4329f15b50268b4b35d09c18c3c89d0ba3a4b072 (diff) | |
| parent | 14494262d39964ccd7f0fbac43f45ac2ea1eb224 (diff) | |
| download | frameworks_base-36960fad6631f3cb5f2c6048e482e19319b6b2d3.zip frameworks_base-36960fad6631f3cb5f2c6048e482e19319b6b2d3.tar.gz frameworks_base-36960fad6631f3cb5f2c6048e482e19319b6b2d3.tar.bz2 | |
Merge "Decoder only returns true on complete success." into lmp-mr1-dev
Diffstat (limited to 'core/jni')
| -rw-r--r-- | core/jni/android/graphics/BitmapFactory.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/jni/android/graphics/BitmapFactory.cpp b/core/jni/android/graphics/BitmapFactory.cpp index e0abc24..a578b5d 100644 --- 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"); } |