diff options
| author | Leon Scroggins <scroggo@google.com> | 2020-01-18 14:07:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-01-18 14:07:55 +0000 |
| commit | 83d7f05c660a57b63a4b7a05128c46747831fb86 (patch) | |
| tree | b902b4a265aa2d4b73b74e825d4dceb55b78eaba | |
| parent | d26e86d2983ab62a13b7876d8754745a79bb76d5 (diff) | |
| parent | d8840bd9f0cf636e8acfc12f9b49ce62a35d7bef (diff) | |
Merge "Update AImageDecoder_getAlphaFlags return value"
| -rw-r--r-- | native/graphics/jni/imagedecoder.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/native/graphics/jni/imagedecoder.cpp b/native/graphics/jni/imagedecoder.cpp index e663534c7a01..51439672d404 100644 --- a/native/graphics/jni/imagedecoder.cpp +++ b/native/graphics/jni/imagedecoder.cpp @@ -225,13 +225,12 @@ AndroidBitmapFormat AImageDecoderHeaderInfo_getAndroidBitmapFormat( int AImageDecoderHeaderInfo_getAlphaFlags(const AImageDecoderHeaderInfo* info) { if (!info) { - // FIXME: Better invalid? - return -1; + return ANDROID_IMAGE_DECODER_BAD_PARAMETER; } switch (toDecoder(info)->mCodec->getInfo().alphaType()) { case kUnknown_SkAlphaType: LOG_ALWAYS_FATAL("Invalid alpha type"); - return -1; + return ANDROID_IMAGE_DECODER_INTERNAL_ERROR; case kUnpremul_SkAlphaType: // fall through. premul is the default. case kPremul_SkAlphaType: |