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

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

Merge "Implement AImageDecoder_computeSampledSize"

parents 8697e36b f89de633

native/graphics/jni/imagedecoder.cpp

+16 −0
Original line number Diff line number Diff line
@@ -131,6 +131,10 @@ static ImageDecoder* toDecoder(AImageDecoder* d) { 
    return reinterpret_cast<ImageDecoder*>(d);

}



static const ImageDecoder* toDecoder(const AImageDecoder* d) {

    return reinterpret_cast<const ImageDecoder*>(d);

}



// Note: This differs from the version in android_bitmap.cpp in that this

// version returns kGray_8_SkColorType for ANDROID_BITMAP_FORMAT_A_8. SkCodec

// allows decoding single channel images to gray, which Android then treats
@@ -258,6 +262,18 @@ int AImageDecoder_setTargetSize(AImageDecoder* decoder, int width, int height) { 
            ? ANDROID_IMAGE_DECODER_SUCCESS : ANDROID_IMAGE_DECODER_INVALID_SCALE;

}



int AImageDecoder_computeSampledSize(const AImageDecoder* decoder, int sampleSize,

                                     int* width, int* height) {

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

        return ANDROID_IMAGE_DECODER_BAD_PARAMETER;

    }



    SkISize size = toDecoder(decoder)->mCodec->getSampledDimensions(sampleSize);

    *width = size.width();

    *height = size.height();

    return ANDROID_IMAGE_DECODER_SUCCESS;

}



int AImageDecoder_setCrop(AImageDecoder* decoder, ARect crop) {

    if (!decoder) {

        return ANDROID_IMAGE_DECODER_BAD_PARAMETER;

native/graphics/jni/libjnigraphics.map.txt

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

    AImageDecoder_decodeImage; # introduced=30

    AImageDecoder_setTargetSize; # introduced=30

    AImageDecoder_computeSampledSize; # introduced=30

    AImageDecoder_setCrop; # introduced=30

    AImageDecoderHeaderInfo_getWidth; # introduced=30

    AImageDecoderHeaderInfo_getHeight; # introduced=30