From 1ca01acfe4e6eba670a41471e993cfb0794e6e6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
Date: Tue, 12 Nov 2019 09:12:11 +0100
Subject: [PATCH] nanosvg: Sync with upstream c1f6e20

Now formally unmaintained, so probably no further sync to expect
from this repository.

(cherry picked from commit 097b746fddee5550acb3f0fab5887aeba7c8038e)
---
 thirdparty/README.md         | 2 +-
 thirdparty/nanosvg/nanosvg.h | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/thirdparty/README.md b/thirdparty/README.md
index 31c14fb18b4..6b4aa026327 100644
--- a/thirdparty/README.md
+++ b/thirdparty/README.md
@@ -315,7 +315,7 @@ Collection of single-file libraries used in Godot components.
 ## nanosvg
 
 - Upstream: https://github.com/memononen/nanosvg
-- Version: git (c1f6e20, 2018)
+- Version: git (25241c5, 2019)
 - License: zlib
 
 Files extracted from the upstream source:
diff --git a/thirdparty/nanosvg/nanosvg.h b/thirdparty/nanosvg/nanosvg.h
index 8c8b061cd16..e5f69006144 100644
--- a/thirdparty/nanosvg/nanosvg.h
+++ b/thirdparty/nanosvg/nanosvg.h
@@ -1102,7 +1102,7 @@ static double nsvg__atof(const char* s)
 	// Parse integer part
 	if (nsvg__isdigit(*cur)) {
 		// Parse digit sequence
-		intPart = (double)strtoll(cur, &end, 10);
+		intPart = strtoll(cur, &end, 10);
 		if (cur != end) {
 			res = (double)intPart;
 			hasIntPart = 1;
@@ -1130,7 +1130,7 @@ static double nsvg__atof(const char* s)
 
 	// Parse optional exponent
 	if (*cur == 'e' || *cur == 'E') {
-		int expPart = 0;
+		long expPart = 0;
 		cur++; // skip 'E'
 		expPart = strtol(cur, &end, 10); // Parse digit sequence with sign
 		if (cur != end) {
@@ -1168,7 +1168,7 @@ static const char* nsvg__parseNumber(const char* s, char* it, const int size)
 		}
 	}
 	// exponent
-	if (*s == 'e' || *s == 'E') {
+	if ((*s == 'e' || *s == 'E') && (s[1] != 'm' && s[1] != 'x')) {
 		if (i < last) it[i++] = *s;
 		s++;
 		if (*s == '-' || *s == '+') {