diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2022-10-13 17:03:36 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2022-10-13 17:05:41 +0200 |
| commit | 99b450762b20939f750bc6f7d3cbcfcdd11bf2f6 (patch) | |
| tree | 6c2ded9e85e09f6113e932a2e4cb19fe1326c5af /thirdparty/thorvg/src/loaders/svg | |
| parent | 99bc4905cbdeec4f91673aaf501703e28180c9d9 (diff) | |
thorvg: Sync with 0.8.2, cleanup SCsub and fix includes
We were compiling `src/loaders/external_png` but using the header from
`src/loaders/png`, leading to `-Wodr` warnings.
Remove unused bundled lodepng code since we use `external_png` (libpng).
Whitespace changes are from upstream, will attempt PR'ing a cleanup there for
future updates.
Diffstat (limited to 'thirdparty/thorvg/src/loaders/svg')
| -rw-r--r-- | thirdparty/thorvg/src/loaders/svg/tvgXmlParser.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/thirdparty/thorvg/src/loaders/svg/tvgXmlParser.cpp b/thirdparty/thorvg/src/loaders/svg/tvgXmlParser.cpp index d7c51bdc30..c373da2dd5 100644 --- a/thirdparty/thorvg/src/loaders/svg/tvgXmlParser.cpp +++ b/thirdparty/thorvg/src/loaders/svg/tvgXmlParser.cpp @@ -26,8 +26,8 @@ #ifdef _WIN32 #include <malloc.h> -#elif defined(__FreeBSD__) - #include <stdlib.h> +#elif __FreeBSD__ + #include<stdlib.h> #else #include <alloca.h> #endif @@ -390,7 +390,7 @@ bool simpleXmlParse(const char* buf, unsigned bufLength, bool strip, simpleXMLCb if (p) { //Invalid case: '<' nested - if (*p == '<') return false; + if (*p == '<' && type != SimpleXMLType::Doctype) return false; const char *start, *end; start = itr + 1 + toff; |