From 38716b94dbcc9dbfb60a49399c5118f01fc79c45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Wed, 19 Jun 2024 11:43:21 +0200 Subject: [PATCH] thorvg: Fix unintended use of `float_t` type, again --- thirdparty/thorvg/patches/pr2338-float_t.patch | 13 +++++++++++++ thirdparty/thorvg/src/loaders/svg/tvgSvgLoader.cpp | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 thirdparty/thorvg/patches/pr2338-float_t.patch diff --git a/thirdparty/thorvg/patches/pr2338-float_t.patch b/thirdparty/thorvg/patches/pr2338-float_t.patch new file mode 100644 index 000000000000..20b9050cbbee --- /dev/null +++ b/thirdparty/thorvg/patches/pr2338-float_t.patch @@ -0,0 +1,13 @@ +diff --git a/thirdparty/thorvg/src/loaders/svg/tvgSvgLoader.cpp b/thirdparty/thorvg/src/loaders/svg/tvgSvgLoader.cpp +index f59994aae6..b2ce38852c 100644 +--- a/thirdparty/thorvg/src/loaders/svg/tvgSvgLoader.cpp ++++ b/thirdparty/thorvg/src/loaders/svg/tvgSvgLoader.cpp +@@ -709,7 +709,7 @@ static bool _toColor(const char* str, uint8_t* r, uint8_t* g, uint8_t* b, char** + *ref = _idFromUrl((const char*)(str + 3)); + return true; + } else if (len >= 10 && (str[0] == 'h' || str[0] == 'H') && (str[1] == 's' || str[1] == 'S') && (str[2] == 'l' || str[2] == 'L') && str[3] == '(' && str[len - 1] == ')') { +- float_t th, ts, tb; ++ float th, ts, tb; + const char *content, *hue, *satuation, *brightness; + content = str + 4; + content = _skipSpace(content, nullptr); diff --git a/thirdparty/thorvg/src/loaders/svg/tvgSvgLoader.cpp b/thirdparty/thorvg/src/loaders/svg/tvgSvgLoader.cpp index f59994aae6fa..b2ce38852c65 100644 --- a/thirdparty/thorvg/src/loaders/svg/tvgSvgLoader.cpp +++ b/thirdparty/thorvg/src/loaders/svg/tvgSvgLoader.cpp @@ -709,7 +709,7 @@ static bool _toColor(const char* str, uint8_t* r, uint8_t* g, uint8_t* b, char** *ref = _idFromUrl((const char*)(str + 3)); return true; } else if (len >= 10 && (str[0] == 'h' || str[0] == 'H') && (str[1] == 's' || str[1] == 'S') && (str[2] == 'l' || str[2] == 'L') && str[3] == '(' && str[len - 1] == ')') { - float_t th, ts, tb; + float th, ts, tb; const char *content, *hue, *satuation, *brightness; content = str + 4; content = _skipSpace(content, nullptr);