godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #87105 from capnm/240112_horvg_from_v0.12.0_to_0.12.1

Browse Source 
ThorVG: update from v0.12.0 to v0.12.1
This commit is contained in:
Rémi Verschelde 2024-01-15 13:29:26 +01:00
commit 7af1df0894
No known key found for this signature in database
GPG Key ID: C3336907360768E1
8 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
thirdparty/README.md vendored
View File

@ -861,7 +861,7 @@ instead of `miniz.h` as an external dependency.
## thorvg ## thorvg
- Upstream: https://github.com/thorvg/thorvg - Upstream: https://github.com/thorvg/thorvg
- Version: 0.12.0 (25ea242d3867ed66807714f5a52d080984d3c8cc, 2024) - Version: 0.12.1 (d761e3c5622c0ffba2e5bb40da05751e2451e495, 2024)
- License: MIT - License: MIT
Files extracted from upstream source: Files extracted from upstream source:

2
thirdparty/thorvg/inc/config.h vendored
View File

@ -9,5 +9,5 @@
// For internal debugging: // For internal debugging:
//#define THORVG_LOG_ENABLED //#define THORVG_LOG_ENABLED
#define THORVG_VERSION_STRING "0.12.0" #define THORVG_VERSION_STRING "0.12.1"
#endif #endif

4
thirdparty/thorvg/src/loaders/svg/tvgSvgLoader.cpp vendored
View File

@ -3732,10 +3732,8 @@ bool SvgLoader::read()
{ {
if (!content || size == 0) return false; if (!content || size == 0) return false;
if (!LoadModule::read()) return true;
//the loading has been already completed in header() //the loading has been already completed in header()
if (root) return true; if (root || !LoadModule::read()) return true;
TaskScheduler::request(this); TaskScheduler::request(this);

7
thirdparty/thorvg/src/loaders/svg/tvgXmlParser.cpp vendored
View File

@ -171,10 +171,11 @@ static const char* _simpleXmlFindStartTag(const char* itr, const char* itrEnd)
static const char* _simpleXmlFindEndTag(const char* itr, const char* itrEnd) static const char* _simpleXmlFindEndTag(const char* itr, const char* itrEnd)
{ {
bool insideQuote = false; bool insideQuote[2] = {false, false}; // 0: ", 1: '
for (; itr < itrEnd; itr++) { for (; itr < itrEnd; itr++) {
if (*itr == '"') insideQuote = !insideQuote; if (*itr == '"' && !insideQuote[1]) insideQuote[0] = !insideQuote[0];
if (!insideQuote) { if (*itr == '\'' && !insideQuote[0]) insideQuote[1] = !insideQuote[1];
if (!insideQuote[0] && !insideQuote[1]) {
if ((*itr == '>') || (*itr == '<')) if ((*itr == '>') || (*itr == '<'))
return itr; return itr;
} }

2
thirdparty/thorvg/src/renderer/sw_engine/tvgSwMemPool.cpp vendored
View File

@ -77,7 +77,7 @@ void mpoolRetDashOutline(SwMpool* mpool, unsigned idx)
} }
SwMpool* mpoolInit(unsigned threads) SwMpool* mpoolInit(uint32_t threads)
{ {
auto allocSize = threads + 1; auto allocSize = threads + 1;

7
thirdparty/thorvg/src/renderer/sw_engine/tvgSwRasterTexmap.h vendored
View File

@ -821,8 +821,8 @@ static void _rasterPolygonImage(SwSurface* surface, const SwImage* image, const
static AASpans* _AASpans(float ymin, float ymax, const SwImage* image, const SwBBox* region) static AASpans* _AASpans(float ymin, float ymax, const SwImage* image, const SwBBox* region)
{ {
auto yStart = static_cast<int32_t>(ymin); auto yStart = static_cast<int>(ymin);
auto yEnd = static_cast<int32_t>(ymax); auto yEnd = static_cast<int>(ymax);
if (!_arrange(image, region, yStart, yEnd)) return nullptr; if (!_arrange(image, region, yStart, yEnd)) return nullptr;
@ -1108,8 +1108,7 @@ static bool _rasterTexmapPolygon(SwSurface* surface, const SwImage* image, const
float ys = FLT_MAX, ye = -1.0f; float ys = FLT_MAX, ye = -1.0f;
for (int i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {
mathMultiply(&vertices[i].pt, transform); if (transform) mathMultiply(&vertices[i].pt, transform);
if (vertices[i].pt.y < ys) ys = vertices[i].pt.y; if (vertices[i].pt.y < ys) ys = vertices[i].pt.y;
if (vertices[i].pt.y > ye) ye = vertices[i].pt.y; if (vertices[i].pt.y > ye) ye = vertices[i].pt.y;
} }

4
thirdparty/thorvg/src/renderer/tvgShape.cpp vendored
View File

@ -130,11 +130,11 @@ Result Shape::appendCircle(float cx, float cy, float rx, float ry) noexcept
auto ryKappa = ry * PATH_KAPPA; auto ryKappa = ry * PATH_KAPPA;
pImpl->grow(6, 13); pImpl->grow(6, 13);
pImpl->moveTo(cx, cy - ry); pImpl->moveTo(cx + rx, cy);
pImpl->cubicTo(cx + rxKappa, cy - ry, cx + rx, cy - ryKappa, cx + rx, cy);
pImpl->cubicTo(cx + rx, cy + ryKappa, cx + rxKappa, cy + ry, cx, cy + ry); pImpl->cubicTo(cx + rx, cy + ryKappa, cx + rxKappa, cy + ry, cx, cy + ry);
pImpl->cubicTo(cx - rxKappa, cy + ry, cx - rx, cy + ryKappa, cx - rx, cy); pImpl->cubicTo(cx - rxKappa, cy + ry, cx - rx, cy + ryKappa, cx - rx, cy);
pImpl->cubicTo(cx - rx, cy - ryKappa, cx - rxKappa, cy - ry, cx, cy - ry); pImpl->cubicTo(cx - rx, cy - ryKappa, cx - rxKappa, cy - ry, cx, cy - ry);
pImpl->cubicTo(cx + rxKappa, cy - ry, cx + rx, cy - ryKappa, cx + rx, cy);
pImpl->close(); pImpl->close();
return Result::Success; return Result::Success;

2
thirdparty/thorvg/update-thorvg.sh vendored
View File

@ -1,6 +1,6 @@
#!/bin/bash -e #!/bin/bash -e
VERSION=0.12.0 VERSION=0.12.1
cd thirdparty/thorvg/ || true cd thirdparty/thorvg/ || true
rm -rf AUTHORS LICENSE inc/ src/ *.zip *.tar.gz tmp/ rm -rf AUTHORS LICENSE inc/ src/ *.zip *.tar.gz tmp/