cheng/nanosvg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Further nextPathItem fixes for numbers

Browse Source
This commit is contained in:
Mikko Mononen 2014-01-26 22:07:28 +02:00
parent 87aed6d1fc
commit a866ad3d7a
1 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/nanosvg.h
View File

@ -119,6 +119,11 @@ static int nsvg__isspace(char c)
return strchr(" \t\n\v\f\r", c) != 0; return strchr(" \t\n\v\f\r", c) != 0;
} }
static int nsvg__isdigit(char c)
{
return strchr("0123456789", c) != 0;
}
static int nsvg__isnum(char c) static int nsvg__isnum(char c)
{ {
return strchr("0123456789+-.eE", c) != 0; return strchr("0123456789+-.eE", c) != 0;
@ -555,17 +560,48 @@ static const char* nsvg__getNextPathItem(const char* s, char* it)
// Skip white spaces and commas // Skip white spaces and commas
while (*s && (nsvg__isspace(*s) || *s == ',')) s++; while (*s && (nsvg__isspace(*s) || *s == ',')) s++;
if (!*s) return s; if (!*s) return s;
if (*s == '-' || *s == '+' || nsvg__isnum(*s)) { if (*s == '-' || *s == '+' || nsvg__isdigit(*s)) {
while (*s && nsvg__isnum(*s)) { // sign
if (*s == '-' || *s == '+') {
if (i < 63) it[i++] = *s; if (i < 63) it[i++] = *s;
s++; s++;
} }
// integer part
while (*s && nsvg__isdigit(*s)) {
if (i < 63) it[i++] = *s;
s++;
}
if (*s == '.') {
// decimal point
if (i < 63) it[i++] = *s;
s++;
// fraction part
while (*s && nsvg__isdigit(*s)) {
if (i < 63) it[i++] = *s;
s++;
}
}
// exponent
if (*s == 'e' || *s == 'E') {
if (i < 63) it[i++] = *s;
s++;
if (*s == '-' || *s == '+') {
if (i < 63) it[i++] = *s;
s++;
}
while (*s && nsvg__isdigit(*s)) {
if (i < 63) it[i++] = *s;
s++;
}
}
it[i] = '\0'; it[i] = '\0';
} else { } else {
// Parse command
it[0] = *s++; it[0] = *s++;
it[1] = '\0'; it[1] = '\0';
return s; return s;
} }
return s; return s;
} }
@ -773,7 +809,7 @@ static unsigned int nsvg__parseColorName(const char* str)
} }
} }
return 0; return NSVG_RGB(128, 128, 128);
} }
static unsigned int nsvg__parseColor(const char* str) static unsigned int nsvg__parseColor(const char* str)