From ccb5a5d1fb062952938ec4c34d3e687d61595c08 Mon Sep 17 00:00:00 2001 From: Hermet Park Date: Wed, 7 Feb 2024 17:31:12 +0900 Subject: [PATCH] Revert "lottie: compatibility++" This reverts commit c89f6253bfbe0f3ad92c3fbcd6a653e11cf637b8. No more valid by 3f235d9e3f7bb8a2188b504f3424e1f056e76541 --- src/loaders/lottie/tvgLottieBuilder.cpp | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/src/loaders/lottie/tvgLottieBuilder.cpp b/src/loaders/lottie/tvgLottieBuilder.cpp index 8d0a04f8..3e55786a 100644 --- a/src/loaders/lottie/tvgLottieBuilder.cpp +++ b/src/loaders/lottie/tvgLottieBuilder.cpp @@ -727,22 +727,17 @@ 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) { - //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], false) == Result::Success) { - succeed = true; - break; - } + if (picture->load((const char*)image->b64Data, image->size, image->mimeType, false) != Result::Success) { + delete(picture); + return; + } + } else { + if (picture->load(image->path) != Result::Success) { + delete(picture); + return; } - } else if (picture->load(image->path) == Result::Success) succeed = true; - - if (!succeed) { - delete(picture); - return; } TaskScheduler::async(true);