From 6afea9c30dd47f0f81e10f897de98f5010d9be51 Mon Sep 17 00:00:00 2001 From: Jakub Marcowski Date: Sun, 17 Mar 2024 01:04:33 +0100 Subject: [PATCH] thorvg: Update to 0.12.9 --- thirdparty/README.md | 2 +- thirdparty/thorvg/inc/config.h | 2 +- thirdparty/thorvg/src/loaders/svg/tvgSvgPath.cpp | 3 --- thirdparty/thorvg/src/renderer/tvgScene.h | 1 - thirdparty/thorvg/src/renderer/tvgShape.h | 1 - thirdparty/thorvg/update-thorvg.sh | 2 +- 6 files changed, 3 insertions(+), 8 deletions(-) diff --git a/thirdparty/README.md b/thirdparty/README.md index 67c92e03e4ee..0520440e52af 100644 --- a/thirdparty/README.md +++ b/thirdparty/README.md @@ -860,7 +860,7 @@ instead of `miniz.h` as an external dependency. ## thorvg - Upstream: https://github.com/thorvg/thorvg -- Version: 0.12.7 (cddae9966cbb48c431ea17c262d6f48393206fd7, 2024) +- Version: 0.12.9 (afa6d8499bd49141d99d5e40a4620bd9f6bc0467, 2024) - License: MIT Files extracted from upstream source: diff --git a/thirdparty/thorvg/inc/config.h b/thirdparty/thorvg/inc/config.h index 1133b99e6409..67716b66cc31 100644 --- a/thirdparty/thorvg/inc/config.h +++ b/thirdparty/thorvg/inc/config.h @@ -10,5 +10,5 @@ // For internal debugging: //#define THORVG_LOG_ENABLED -#define THORVG_VERSION_STRING "0.12.7" +#define THORVG_VERSION_STRING "0.12.9" #endif diff --git a/thirdparty/thorvg/src/loaders/svg/tvgSvgPath.cpp b/thirdparty/thorvg/src/loaders/svg/tvgSvgPath.cpp index 67c87ba14926..f9780749a9da 100644 --- a/thirdparty/thorvg/src/loaders/svg/tvgSvgPath.cpp +++ b/thirdparty/thorvg/src/loaders/svg/tvgSvgPath.cpp @@ -122,9 +122,6 @@ void _pathAppendArcTo(Array* cmds, Array* pts, Point* cur, P sx = cur->x; sy = cur->y; - //If start and end points are identical, then no arc is drawn - if ((fabsf(x - sx) < (1.0f / 256.0f)) && (fabsf(y - sy) < (1.0f / 256.0f))) return; - //Correction of out-of-range radii, see F6.6.1 (step 2) rx = fabsf(rx); ry = fabsf(ry); diff --git a/thirdparty/thorvg/src/renderer/tvgScene.h b/thirdparty/thorvg/src/renderer/tvgScene.h index 5fb6e45cab4d..8b1981edfab1 100644 --- a/thirdparty/thorvg/src/renderer/tvgScene.h +++ b/thirdparty/thorvg/src/renderer/tvgScene.h @@ -133,7 +133,6 @@ struct Scene::Impl if (needComp) { cmp = renderer->target(bounds(renderer), renderer->colorSpace()); renderer->beginComposite(cmp, CompositeMethod::None, opacity); - needComp = false; } for (auto paint : paints) { diff --git a/thirdparty/thorvg/src/renderer/tvgShape.h b/thirdparty/thorvg/src/renderer/tvgShape.h index 740da55847df..e438a61c1660 100644 --- a/thirdparty/thorvg/src/renderer/tvgShape.h +++ b/thirdparty/thorvg/src/renderer/tvgShape.h @@ -56,7 +56,6 @@ struct Shape::Impl if (needComp) { cmp = renderer->target(bounds(renderer), renderer->colorSpace()); renderer->beginComposite(cmp, CompositeMethod::None, opacity); - needComp = false; } ret = renderer->renderShape(rd); if (cmp) renderer->endComposite(cmp); diff --git a/thirdparty/thorvg/update-thorvg.sh b/thirdparty/thorvg/update-thorvg.sh index 3ef2c25878d0..7a754c09b98a 100755 --- a/thirdparty/thorvg/update-thorvg.sh +++ b/thirdparty/thorvg/update-thorvg.sh @@ -1,6 +1,6 @@ #!/bin/bash -e -VERSION=0.12.7 +VERSION=0.12.9 cd thirdparty/thorvg/ || true rm -rf AUTHORS LICENSE inc/ src/ *.zip *.tar.gz tmp/