Merge pull request #83656 from capnm/thorvg_0.11.2

ThorVG: update to v0.11.2
This commit is contained in:
Rémi Verschelde 2023-10-20 15:13:03 +02:00
commit dd6afa6609
No known key found for this signature in database
GPG key ID: C3336907360768E1
5 changed files with 4 additions and 18 deletions

View file

@ -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

View file

@ -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

View file

@ -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;

View file

@ -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) {

View file

@ -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/