From c89f6253bfbe0f3ad92c3fbcd6a653e11cf637b8 Mon Sep 17 00:00:00 2001
From: Hermet Park <hermet@lottiefiles.com>
Date: Wed, 31 Jan 2024 16:03:44 +0900
Subject: [PATCH] lottie: compatibility++

retry image loading with the given candidates,
even if the suggested format is mismatched.
---
 src/loaders/lottie/tvgLottieBuilder.cpp | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/loaders/lottie/tvgLottieBuilder.cpp b/src/loaders/lottie/tvgLottieBuilder.cpp
index 4efbc2ef..b72f4be1 100644
--- a/src/loaders/lottie/tvgLottieBuilder.cpp
+++ b/src/loaders/lottie/tvgLottieBuilder.cpp
@@ -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);