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

Commit 795168a1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update imagedecoder for header updates"

parents ea59d869 64301cbe

native/graphics/jni/imagedecoder.cpp

+3 −11
Original line number Diff line number Diff line
@@ -208,13 +208,6 @@ const char* AImageDecoderHeaderInfo_getMimeType(const AImageDecoderHeaderInfo* i 
    return getMimeType(toDecoder(info)->mCodec->getEncodedFormat());

}



bool AImageDecoderHeaderInfo_isAnimated(const AImageDecoderHeaderInfo* info) {

    if (!info) {

        return false;

    }

    return toDecoder(info)->mCodec->codec()->getFrameCount() > 1;

}



int32_t AImageDecoderHeaderInfo_getDataSpace(const AImageDecoderHeaderInfo* info) {

    if (!info) {

        return ANDROID_IMAGE_DECODER_BAD_PARAMETER;
@@ -247,8 +240,7 @@ static AndroidBitmapFormat getFormat(SkColorType colorType) { 
    }

}



AndroidBitmapFormat AImageDecoderHeaderInfo_getAndroidBitmapFormat(

        const AImageDecoderHeaderInfo* info) {

int32_t AImageDecoderHeaderInfo_getAndroidBitmapFormat(const AImageDecoderHeaderInfo* info) {

    if (!info) {

        return ANDROID_BITMAP_FORMAT_NONE;

    }
@@ -281,7 +273,7 @@ int AImageDecoder_setUnpremultipliedRequired(AImageDecoder* decoder, bool requir 
            ? ANDROID_IMAGE_DECODER_SUCCESS : ANDROID_IMAGE_DECODER_INVALID_CONVERSION;

}



int AImageDecoder_setTargetSize(AImageDecoder* decoder, int width, int height) {

int AImageDecoder_setTargetSize(AImageDecoder* decoder, int32_t width, int32_t height) {

    if (!decoder) {

        return ANDROID_IMAGE_DECODER_BAD_PARAMETER;

    }
@@ -291,7 +283,7 @@ int AImageDecoder_setTargetSize(AImageDecoder* decoder, int width, int height) { 
}



int AImageDecoder_computeSampledSize(const AImageDecoder* decoder, int sampleSize,

                                     int* width, int* height) {

                                     int32_t* width, int32_t* height) {

    if (!decoder || !width || !height || sampleSize < 1) {

        return ANDROID_IMAGE_DECODER_BAD_PARAMETER;

    }

native/graphics/jni/libjnigraphics.map.txt

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ LIBJNIGRAPHICS { 
    AImageDecoderHeaderInfo_getHeight; # introduced=30

    AImageDecoderHeaderInfo_getMimeType; # introduced=30

    AImageDecoderHeaderInfo_getAlphaFlags; # introduced=30

    AImageDecoderHeaderInfo_isAnimated; # introduced=30

    AImageDecoderHeaderInfo_getAndroidBitmapFormat; # introduced=30

    AImageDecoderHeaderInfo_getDataSpace; # introduced=30

    AndroidBitmap_getInfo;