Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update imagedecoder for header updates"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-01-23 18:58:16 +00:00
committed by Android (Google) Code Review
parent ea59d86962 64301cbed1
commit 795168a1b8
2 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
native/graphics/jni/imagedecoder.cpp
View File

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

1
native/graphics/jni/libjnigraphics.map.txt
View File

@@ -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;