thorvg: Update to 0.10.7

COPYRIGHT.txt

@@ -466,7 +466,7 @@ License: Expat
 
 Files: ./thirdparty/thorvg/
 Comment: ThorVG
-Copyright: 2020-2022, Samsung Electronics Co., Ltd.
+Copyright: 2020-2023, The ThorVG Project
 License: Expat
 
 Files: ./thirdparty/tinyexr/

modules/svg/SCsub

@@ -21,23 +21,22 @@ thirdparty_sources = [
     "src/lib/sw_engine/tvgSwShape.cpp",
     "src/lib/sw_engine/tvgSwStroke.cpp",
     "src/lib/tvgAccessor.cpp",
-    "src/lib/tvgBezier.cpp",
     "src/lib/tvgCanvas.cpp",
     "src/lib/tvgFill.cpp",
     "src/lib/tvgGlCanvas.cpp",
     "src/lib/tvgInitializer.cpp",
-    "src/lib/tvgLinearGradient.cpp",
     "src/lib/tvgLoader.cpp",
-    "src/lib/tvgLzw.cpp",
     "src/lib/tvgPaint.cpp",
     "src/lib/tvgPicture.cpp",
-    "src/lib/tvgRadialGradient.cpp",
     "src/lib/tvgRender.cpp",
     "src/lib/tvgSaver.cpp",
     "src/lib/tvgScene.cpp",
     "src/lib/tvgShape.cpp",
     "src/lib/tvgSwCanvas.cpp",
     "src/lib/tvgTaskScheduler.cpp",
+    "src/utils/tvgBezier.cpp",
+    "src/utils/tvgCompressor.cpp",
+    "src/utils/tvgStr.cpp",
     "src/loaders/raw/tvgRawLoader.cpp",
     "src/loaders/svg/tvgSvgCssStyle.cpp",
     "src/loaders/svg/tvgSvgLoader.cpp",
@@ -62,6 +61,7 @@ env_thirdparty.Prepend(
         thirdparty_dir + "src/lib/sw_engine",
         thirdparty_dir + "src/loaders/raw",
         thirdparty_dir + "src/loaders/svg",
+        thirdparty_dir + "src/utils",
     ]
 )
 # Also requires libpng headers

modules/text_server_adv/SCsub

@@ -39,7 +39,9 @@ freetype_enabled = "freetype" in env.module_list
 msdfgen_enabled = "msdfgen" in env.module_list
 
 if "svg" in env.module_list:
-    env_text_server_adv.Prepend(CPPPATH=["#thirdparty/thorvg/inc", "#thirdparty/thorvg/src/lib"])
+    env_text_server_adv.Prepend(
+        CPPPATH=["#thirdparty/thorvg/inc", "#thirdparty/thorvg/src/lib", "#thirdparty/thorvg/src/utils"]
+    )
     # Enable ThorVG static object linking.
     env_text_server_adv.Append(CPPDEFINES=["TVG_STATIC"])
 

modules/text_server_adv/gdextension_build/SConstruct

@@ -52,23 +52,22 @@ if env["thorvg_enabled"] and env["freetype_enabled"]:
         "src/lib/sw_engine/tvgSwShape.cpp",
         "src/lib/sw_engine/tvgSwStroke.cpp",
         "src/lib/tvgAccessor.cpp",
-        "src/lib/tvgBezier.cpp",
         "src/lib/tvgCanvas.cpp",
         "src/lib/tvgFill.cpp",
         "src/lib/tvgGlCanvas.cpp",
         "src/lib/tvgInitializer.cpp",
-        "src/lib/tvgLinearGradient.cpp",
         "src/lib/tvgLoader.cpp",
-        "src/lib/tvgLzw.cpp",
         "src/lib/tvgPaint.cpp",
         "src/lib/tvgPicture.cpp",
-        "src/lib/tvgRadialGradient.cpp",
         "src/lib/tvgRender.cpp",
         "src/lib/tvgSaver.cpp",
         "src/lib/tvgScene.cpp",
         "src/lib/tvgShape.cpp",
         "src/lib/tvgSwCanvas.cpp",
         "src/lib/tvgTaskScheduler.cpp",
+        "src/utils/tvgBezier.cpp",
+        "src/utils/tvgCompressor.cpp",
+        "src/utils/tvgStr.cpp",
         "src/loaders/raw/tvgRawLoader.cpp",
         "src/loaders/svg/tvgSvgCssStyle.cpp",
         "src/loaders/svg/tvgSvgLoader.cpp",
@@ -86,14 +85,21 @@ if env["thorvg_enabled"] and env["freetype_enabled"]:
             "../../../thirdparty/thorvg/src/lib/sw_engine",
             "../../../thirdparty/thorvg/src/loaders/raw",
             "../../../thirdparty/thorvg/src/loaders/svg",
+            "../../../thirdparty/thorvg/src/utils",
             "../../../thirdparty/libpng",
         ]
     )
 
     # Enable ThorVG static object linking.
     env_tvg.Append(CPPDEFINES=["TVG_STATIC"])
 
-    env.Append(CPPPATH=["../../../thirdparty/thorvg/inc", "../../../thirdparty/thorvg/src/lib"])
+    env.Append(
+        CPPPATH=[
+            "../../../thirdparty/thorvg/inc",
+            "../../../thirdparty/thorvg/src/lib",
+            "../../../thirdparty/thorvg/src/utils",
+        ]
+    )
     env.Append(CPPDEFINES=["MODULE_SVG_ENABLED"])
 
     lib = env_tvg.Library(

modules/text_server_fb/SCsub

@@ -9,7 +9,9 @@ msdfgen_enabled = "msdfgen" in env.module_list
 env_text_server_fb = env_modules.Clone()
 
 if "svg" in env.module_list:
-    env_text_server_fb.Prepend(CPPPATH=["#thirdparty/thorvg/inc", "#thirdparty/thorvg/src/lib"])
+    env_text_server_fb.Prepend(
+        CPPPATH=["#thirdparty/thorvg/inc", "#thirdparty/thorvg/src/lib", "#thirdparty/thorvg/src/utils"]
+    )
     # Enable ThorVG static object linking.
     env_text_server_fb.Append(CPPDEFINES=["TVG_STATIC"])
 

modules/text_server_fb/gdextension_build/SConstruct

@@ -47,23 +47,22 @@ if env["thorvg_enabled"] and env["freetype_enabled"]:
         "src/lib/sw_engine/tvgSwShape.cpp",
         "src/lib/sw_engine/tvgSwStroke.cpp",
         "src/lib/tvgAccessor.cpp",
-        "src/lib/tvgBezier.cpp",
         "src/lib/tvgCanvas.cpp",
         "src/lib/tvgFill.cpp",
         "src/lib/tvgGlCanvas.cpp",
         "src/lib/tvgInitializer.cpp",
-        "src/lib/tvgLinearGradient.cpp",
         "src/lib/tvgLoader.cpp",
-        "src/lib/tvgLzw.cpp",
         "src/lib/tvgPaint.cpp",
         "src/lib/tvgPicture.cpp",
-        "src/lib/tvgRadialGradient.cpp",
         "src/lib/tvgRender.cpp",
         "src/lib/tvgSaver.cpp",
         "src/lib/tvgScene.cpp",
         "src/lib/tvgShape.cpp",
         "src/lib/tvgSwCanvas.cpp",
         "src/lib/tvgTaskScheduler.cpp",
+        "src/utils/tvgBezier.cpp",
+        "src/utils/tvgCompressor.cpp",
+        "src/utils/tvgStr.cpp",
         "src/loaders/raw/tvgRawLoader.cpp",
         "src/loaders/svg/tvgSvgCssStyle.cpp",
         "src/loaders/svg/tvgSvgLoader.cpp",
@@ -81,14 +80,21 @@ if env["thorvg_enabled"] and env["freetype_enabled"]:
             "../../../thirdparty/thorvg/src/lib/sw_engine",
             "../../../thirdparty/thorvg/src/loaders/raw",
             "../../../thirdparty/thorvg/src/loaders/svg",
+            "../../../thirdparty/thorvg/src/utils",
             "../../../thirdparty/libpng",
         ]
     )
 
     # Enable ThorVG static object linking.
     env_tvg.Append(CPPDEFINES=["TVG_STATIC"])
 
-    env.Append(CPPPATH=["../../../thirdparty/thorvg/inc", "../../../thirdparty/thorvg/src/lib"])
+    env.Append(
+        CPPPATH=[
+            "../../../thirdparty/thorvg/inc",
+            "../../../thirdparty/thorvg/src/lib",
+            "../../../thirdparty/thorvg/src/utils",
+        ]
+    )
     env.Append(CPPDEFINES=["MODULE_SVG_ENABLED"])
 
     lib = env_tvg.Library(

thirdparty/README.md

@@ -815,7 +815,7 @@ instead of `miniz.h` as an external dependency.
 ## thorvg
 
 - Upstream: https://github.com/thorvg/thorvg
-- Version: 0.10.0 (b8c605583fd7de73209a93a1238e1ba72cce2e8f, 2023)
+- Version: 0.10.7 (026ff4ce7eda10dd0cf80eeaef56fe3a5ed89f93, 2023)
 - License: MIT
 
 Files extracted from upstream source:

thirdparty/thorvg/inc/config.h

@@ -5,5 +5,5 @@
 
 #define THORVG_SVG_LOADER_SUPPORT
 
-#define THORVG_VERSION_STRING "0.10.0"
+#define THORVG_VERSION_STRING "0.10.7"
 #endif

thirdparty/thorvg/inc/thorvg.h

@@ -1268,7 +1268,7 @@ class TVG_API Picture final : public Paint
      *
      * @param[in] data A pointer to a memory location where the content of the picture file is stored.
      * @param[in] size The size in bytes of the memory occupied by the @p data.
-     * @param[in] mimeType Mimetype or extension of data such as "jpg", "jpeg", "svg", "svg+xml", "png", etc. In case an empty string or an unknown type is provided, the loaders will be tried one by one.
+     * @param[in] mimeType Mimetype or extension of data such as "jpg", "jpeg", "lottie", "svg", "svg+xml", "png", etc. In case an empty string or an unknown type is provided, the loaders will be tried one by one.
      * @param[in] copy If @c true the data are copied into the engine local buffer, otherwise they are not.
      *
      * @retval Result::Success When succeed.
@@ -1278,6 +1278,7 @@ class TVG_API Picture final : public Paint
      *
      * @warning: It's the user responsibility to release the @p data memory if the @p copy is @c true.
      *
+     * @note If you are unsure about the MIME type, you can provide an empty value like @c "", and thorvg will attempt to figure it out.
      * @since 0.5
      */
     Result load(const char* data, uint32_t size, const std::string& mimeType, bool copy = false) noexcept;