chore: 🤖 utilize ABGR8888S color space for web (#100)

LottieFiles · Mar 18, 2024 · 608f606 · 608f606
1 parent 136b505
commit 608f606
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/deps/modules/thorvg b/deps/modules/thorvg
diff --git a/dotlottie-rs/src/lottie_renderer/mod.rs b/dotlottie-rs/src/lottie_renderer/mod.rs
@@ -69,7 +69,7 @@ impl LottieRenderer {
                 self.width,
                 self.width,
                 self.height,
-                TvgColorspace::ABGR8888,
+                get_color_space_for_target(),
             )
             .map_err(LottieRendererError::ThorvgError)?;
 
@@ -184,7 +184,7 @@ impl LottieRenderer {
                 self.width,
                 self.width,
                 self.height,
-                TvgColorspace::ABGR8888,
+                get_color_space_for_target(),
             )
             .map_err(LottieRendererError::ThorvgError)?;
 
@@ -269,3 +269,16 @@ fn hex_to_rgba(hex_color: u32) -> (u8, u8, u8, u8) {
 
     (red, green, blue, alpha)
 }
+
+#[inline]
+fn get_color_space_for_target() -> TvgColorspace {
+    #[cfg(target_arch = "wasm32")]
+    {
+        TvgColorspace::ABGR8888S
+    }
+
+    #[cfg(not(target_arch = "wasm32"))]
+    {
+        TvgColorspace::ABGR8888
+    }
+}
diff --git a/dotlottie-rs/src/thorvg.rs b/dotlottie-rs/src/thorvg.rs
@@ -34,7 +34,9 @@ pub enum TvgEngine {
 
 pub enum TvgColorspace {
     ABGR8888,
+    ABGR8888S,
     ARGB8888,
+    ARGB8888S,
 }
 
 fn convert_tvg_result(result: Tvg_Result, function_name: &str) -> Result<(), TvgError> {
@@ -99,7 +101,9 @@ impl Canvas {
     ) -> Result<(), TvgError> {
         let color_space = match color_space {
             TvgColorspace::ABGR8888 => Tvg_Colorspace_TVG_COLORSPACE_ABGR8888,
+            TvgColorspace::ABGR8888S => Tvg_Colorspace_TVG_COLORSPACE_ABGR8888S,
             TvgColorspace::ARGB8888 => Tvg_Colorspace_TVG_COLORSPACE_ARGB8888,
+            TvgColorspace::ARGB8888S => Tvg_Colorspace_TVG_COLORSPACE_ARGB8888S,
         };
 
         let result = unsafe {
+1 −1		meson.build
+4 −2		src/bindings/capi/thorvg_capi.h
+3 −9		src/loaders/lottie/tvgLottieParser.cpp
+1 −1		src/loaders/lottie/tvgLottieParser.h
+5 −5		src/loaders/webp/utils/bit_reader.cpp
+3 −7		src/loaders/webp/utils/bit_reader_inl.h
+12 −0		src/loaders/webp/utils/utils.h