9dfef1c5f7
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12436 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
62 lines
1.7 KiB
Diff
62 lines
1.7 KiB
Diff
Index: nanosvg.h
|
|
===================================================================
|
|
--- nanosvg.h (revision 12413)
|
|
+++ nanosvg.h (working copy)
|
|
@@ -1081,7 +1081,7 @@
|
|
char* cur = (char*)s;
|
|
char* end = NULL;
|
|
double res = 0.0, sign = 1.0;
|
|
- long long intPart = 0, fracPart = 0;
|
|
+ double intPart = 0, fracPart = 0;
|
|
char hasIntPart = 0, hasFracPart = 0;
|
|
|
|
// Parse optional sign
|
|
@@ -1095,7 +1095,11 @@
|
|
// Parse integer part
|
|
if (nsvg__isdigit(*cur)) {
|
|
// Parse digit sequence
|
|
- intPart = (double)strtoll(cur, &end, 10);
|
|
+#ifdef _MSC_VER
|
|
+ intPart = (double)_strtoi64(cur, &end, 10);
|
|
+#else
|
|
+ intPart = (double)strtoll(cur, &end, 10);
|
|
+#endif
|
|
if (cur != end) {
|
|
res = (double)intPart;
|
|
hasIntPart = 1;
|
|
@@ -1108,7 +1112,11 @@
|
|
cur++; // Skip '.'
|
|
if (nsvg__isdigit(*cur)) {
|
|
// Parse digit sequence
|
|
- fracPart = strtoll(cur, &end, 10);
|
|
+#ifdef _MSC_VER
|
|
+ fracPart = (double)_strtoi64(cur, &end, 10);
|
|
+#else
|
|
+ fracPart = (double)strtoll(cur, &end, 10);
|
|
+#endif
|
|
if (cur != end) {
|
|
res += (double)fracPart / pow(10.0, (double)(end - cur));
|
|
hasFracPart = 1;
|
|
@@ -1123,11 +1131,11 @@
|
|
|
|
// Parse optional exponent
|
|
if (*cur == 'e' || *cur == 'E') {
|
|
- int expPart = 0;
|
|
+ double expPart = 0;
|
|
cur++; // skip 'E'
|
|
- expPart = strtol(cur, &end, 10); // Parse digit sequence with sign
|
|
+ expPart = (double)strtol(cur, &end, 10); // Parse digit sequence with sign
|
|
if (cur != end) {
|
|
- res *= pow(10.0, (double)expPart);
|
|
+ res *= pow(10.0, expPart);
|
|
}
|
|
}
|
|
|
|
|
|
Property changes on: nanosvg.h
|
|
___________________________________________________________________
|
|
Added: eol-style
|
|
## -0,0 +1 ##
|
|
+native
|
|
\ No newline at end of property
|