diff options
| -rw-r--r-- | thirdparty/README.md | 3 | ||||
| -rw-r--r-- | thirdparty/thorvg/inc/config.h | 2 | ||||
| -rw-r--r-- | thirdparty/thorvg/patches/loader_jpg-fix_regression_bug.patch | 13 | ||||
| -rw-r--r-- | thirdparty/thorvg/src/renderer/sw_engine/tvgSwRasterC.h | 2 | ||||
| -rwxr-xr-x | thirdparty/thorvg/update-thorvg.sh | 2 |
5 files changed, 4 insertions, 18 deletions
diff --git a/thirdparty/README.md b/thirdparty/README.md index 218bddbf54..980c35abb0 100644 --- a/thirdparty/README.md +++ b/thirdparty/README.md @@ -805,7 +805,7 @@ instead of `miniz.h` as an external dependency. ## thorvg - Upstream: https://github.com/thorvg/thorvg -- Version: 0.11.1 (ca00e52125446a1a5cca20f9d8621b382cff5cb9, 2023) +- Version: 0.11.2 (b01fe9bf4461146304d3520d6dc699cf580a3744, 2023) - License: MIT Files extracted from upstream source: @@ -813,7 +813,6 @@ Files extracted from upstream source: See `thorvg/update-thorvg.sh` for extraction instructions. Set the version number and run the script. -Apply patches from the `patches` folder. ## vhacd diff --git a/thirdparty/thorvg/inc/config.h b/thirdparty/thorvg/inc/config.h index 3152dfabd8..818739b113 100644 --- a/thirdparty/thorvg/inc/config.h +++ b/thirdparty/thorvg/inc/config.h @@ -9,5 +9,5 @@ // For internal debugging: //#define THORVG_LOG_ENABLED -#define THORVG_VERSION_STRING "0.11.1" +#define THORVG_VERSION_STRING "0.11.2" #endif diff --git a/thirdparty/thorvg/patches/loader_jpg-fix_regression_bug.patch b/thirdparty/thorvg/patches/loader_jpg-fix_regression_bug.patch deleted file mode 100644 index a71883cb35..0000000000 --- a/thirdparty/thorvg/patches/loader_jpg-fix_regression_bug.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/thirdparty/thorvg/src/loaders/jpg/tvgJpgd.cpp b/thirdparty/thorvg/src/loaders/jpg/tvgJpgd.cpp -index 88d359aaa3..61a5dc1c0f 100644 ---- a/thirdparty/thorvg/src/loaders/jpg/tvgJpgd.cpp -+++ b/thirdparty/thorvg/src/loaders/jpg/tvgJpgd.cpp -@@ -431,7 +431,7 @@ struct Row<1> - { - static void idct(int* pTemp, const jpgd_block_t* pSrc) - { -- const int dcval = pSrc[0] * (pSrc[0] * (PASS1_BITS * 2)); -+ const int dcval = pSrc[0] * PASS1_BITS * 2; - - pTemp[0] = dcval; - pTemp[1] = dcval; diff --git a/thirdparty/thorvg/src/renderer/sw_engine/tvgSwRasterC.h b/thirdparty/thorvg/src/renderer/sw_engine/tvgSwRasterC.h index eb377e78e3..da3c7077e8 100644 --- a/thirdparty/thorvg/src/renderer/sw_engine/tvgSwRasterC.h +++ b/thirdparty/thorvg/src/renderer/sw_engine/tvgSwRasterC.h @@ -101,7 +101,7 @@ static bool inline cRasterTranslucentRect(SwSurface* surface, const SwBBox& regi //32bits channels if (surface->channelSize == sizeof(uint32_t)) { - auto color = surface->join(r, g, b, 255); + auto color = surface->join(r, g, b, a); auto buffer = surface->buf32 + (region.min.y * surface->stride) + region.min.x; auto ialpha = 255 - a; for (uint32_t y = 0; y < h; ++y) { diff --git a/thirdparty/thorvg/update-thorvg.sh b/thirdparty/thorvg/update-thorvg.sh index 0139f522b8..04d1dd0b9a 100755 --- a/thirdparty/thorvg/update-thorvg.sh +++ b/thirdparty/thorvg/update-thorvg.sh @@ -1,6 +1,6 @@ #!/bin/bash -e -VERSION=0.11.1 +VERSION=0.11.2 cd thirdparty/thorvg/ || true rm -rf AUTHORS LICENSE inc/ src/ *.zip *.tar.gz tmp/ |