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

Merge pull request #33562 from akien-mga/nanosvg-25241c5 

nanosvg: Sync with upstream c1f6e20
This commit is contained in:
Rémi Verschelde 2019-11-12 09:52:47 +01:00 committed by GitHub
parent 604891a87d 097b746fdd
commit cbc5d9405f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
thirdparty/README.md vendored
View File

@ -385,7 +385,7 @@ Collection of single-file libraries used in Godot components.
## nanosvg ## nanosvg
- Upstream: https://github.com/memononen/nanosvg - Upstream: https://github.com/memononen/nanosvg
- Version: git (c1f6e20, 2018) - Version: git (25241c5, 2019)
- License: zlib - License: zlib
Files extracted from the upstream source: Files extracted from the upstream source:

6
thirdparty/nanosvg/nanosvg.h vendored
View File

@ -1102,7 +1102,7 @@ static double nsvg__atof(const char* s)
// Parse integer part // Parse integer part
if (nsvg__isdigit(*cur)) { if (nsvg__isdigit(*cur)) {
// Parse digit sequence // Parse digit sequence
intPart = (double)strtoll(cur, &end, 10); intPart = strtoll(cur, &end, 10);
if (cur != end) { if (cur != end) {
res = (double)intPart; res = (double)intPart;
hasIntPart = 1; hasIntPart = 1;
@ -1130,7 +1130,7 @@ static double nsvg__atof(const char* s)
// Parse optional exponent // Parse optional exponent
if (*cur == 'e' || *cur == 'E') { if (*cur == 'e' || *cur == 'E') {
int expPart = 0; long expPart = 0;
cur++; // skip 'E' cur++; // skip 'E'
expPart = strtol(cur, &end, 10); // Parse digit sequence with sign expPart = strtol(cur, &end, 10); // Parse digit sequence with sign
if (cur != end) { if (cur != end) {
@ -1168,7 +1168,7 @@ static const char* nsvg__parseNumber(const char* s, char* it, const int size)
} }
} }
// exponent // exponent
if (*s == 'e' || *s == 'E') { if ((*s == 'e' || *s == 'E') && (s[1] != 'm' && s[1] != 'x')) {
if (i < last) it[i++] = *s; if (i < last) it[i++] = *s;
s++; s++;
if (*s == '-' || *s == '+') { if (*s == '-' || *s == '+') {