Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83d7f05c authored by Leon Scroggins's avatar Leon Scroggins Committed by Android (Google) Code Review
Browse files

Merge "Update AImageDecoder_getAlphaFlags return value"

parents d26e86d2 d8840bd9

native/graphics/jni/imagedecoder.cpp

+2 −3
Original line number Diff line number Diff line
@@ -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: