Merge branch 'hunterize' of github.com:tesch1/nanosvg into hunterize

memononen · Mar 25, 2019 · 6f6fb16 · 6f6fb16
2 parents 908d128 + 5a4233d
commit 6f6fb16
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/nanosvg.h b/src/nanosvg.h
@@ -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 == '+') {