firka/flutter
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle decompressed images in InstantiateImageCodec (flutter/engine#9901)

Browse Source 
Fixes https://github.com/flutter/flutter/issues/36312
This commit is contained in:
Jason Simmons
2019-07-18 14:50:45 -07:00
committed by GitHub
parent 1271e8defc
commit a5f93f517b
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
engine/src/flutter/lib/ui/painting/codec.cc
View File

@@ -198,16 +198,22 @@ static void InstantiateImageCodec(Dart_NativeArguments args) {
const int targetHeight =
tonic::DartConverter<int>::FromDart(Dart_GetNativeArgument(args, 4));
auto codec = SkCodec::MakeFromData(buffer);
if (!codec) {
Dart_SetReturnValue(args, ToDart("Could not instantiate image codec."));
return;
std::unique_ptr<SkCodec> codec;
bool single_frame;
if (image_info) {
single_frame = true;
} else {
codec = SkCodec::MakeFromData(buffer);
if (!codec) {
Dart_SetReturnValue(args, ToDart("Could not instantiate image codec."));
return;
}
single_frame = codec->getFrameCount() == 1;
}
fml::RefPtr<Codec> ui_codec;
if (codec->getFrameCount() == 1) {
if (single_frame) {
ImageDecoder::ImageDescriptor descriptor;
descriptor.decompressed_image_info = image_info;