am e8556de6: am 36960fad: Merge "Decoder only returns true on complete success." into lmp-mr1-dev

* commit 'e8556de6f82ae0f4e4c8e76679e94abc23d724cf':
  Decoder only returns true on complete success.
This commit is contained in:
Leon Scroggins III
2014-10-22 22:39:10 +00:00
committed by Android Git Automerger

View File

@@ -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");
}