git_clone/thorvg
1
0
Fork 0
mirror of https://github.com/thorvg/thorvg.git synced 2025-06-08 21:53:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

lottie: compatibility++

Browse source 
retry image loading with the given candidates,
even if the suggested format is mismatched.
This commit is contained in:
Hermet Park 2024-01-31 16:03:44 +09:00 • committed by Hermet Park
parent 6b6947f679
commit c89f6253bf
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/loaders/lottie/tvgLottieBuilder.cpp
View file

@ -727,17 +727,22 @@ static void _updateImage(LottieGroup* parent, LottieObject** child, float frameN
//force to load a picture on the same thread
TaskScheduler::async(false);
auto succeed = false;
if (image->size > 0) {
if (picture->load((const char*)image->b64Data, image->size, image->mimeType) != Result::Success) {
delete(picture);
return;
}
} else {
if (picture->load(image->path) != Result::Success) {
delete(picture);
return;
//try all, just in case.
const char* type[] = {image->mimeType, "png", "jpg", "webp"};
for (int i = 0; i < 4; ++i) {
if (picture->load((const char*)image->b64Data, image->size, type[i]) == Result::Success) {
succeed = true;
break;
}
}
} else if (picture->load(image->path) != Result::Success) succeed = true;
if (!succeed) {
delete(picture);
return;
}
TaskScheduler::async(true);