From bace6b9e5257ae0075481e606496d9280f36e15e Mon Sep 17 00:00:00 2001 From: Hermet Park Date: Thu, 15 May 2025 19:02:46 +0900 Subject: [PATCH] lottie: removed undesired embedded option. Use local font by default and fall back if no glyphs exist. Co-Authored-By: Mira Grudzinska --- src/loaders/lottie/tvgLottieBuilder.cpp | 2 +- src/loaders/lottie/tvgLottieModel.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/loaders/lottie/tvgLottieBuilder.cpp b/src/loaders/lottie/tvgLottieBuilder.cpp index b883a22f..f0cada5c 100644 --- a/src/loaders/lottie/tvgLottieBuilder.cpp +++ b/src/loaders/lottie/tvgLottieBuilder.cpp @@ -934,7 +934,7 @@ void LottieBuilder::updateText(LottieLayer* layer, float frameNo) if (!p || !text->font) return; - if (text->font->origin != LottieFont::Origin::Embedded) { + if (text->font->origin != LottieFont::Origin::Local || text->font->chars.empty()) { _fontText(doc, layer->scene); return; } diff --git a/src/loaders/lottie/tvgLottieModel.h b/src/loaders/lottie/tvgLottieModel.h index 572fe9c3..9b8e819a 100644 --- a/src/loaders/lottie/tvgLottieModel.h +++ b/src/loaders/lottie/tvgLottieModel.h @@ -386,7 +386,7 @@ struct LottieTextRange struct LottieFont { - enum Origin : uint8_t { Local = 0, CssURL, ScriptURL, FontURL, Embedded }; + enum Origin : uint8_t {Local = 0, CssURL, ScriptURL, FontURL}; ~LottieFont() { @@ -408,7 +408,7 @@ struct LottieFont char* style = nullptr; size_t dataSize = 0; float ascent = 0.0f; - Origin origin = Embedded; + Origin origin = Local; void prepare(); };