diff options
| author | Vincent Sanders <vince@kyllikki.org> | 2014-10-23 22:18:16 +0100 |
|---|---|---|
| committer | Vincent Sanders <vince@kyllikki.org> | 2014-10-23 22:34:00 +0100 |
| commit | fd3d01047c69b633d0dfc2f079791c3302971004 (patch) | |
| tree | 35474c5bbbc6fe1eb80d0f1c0d1bcbc5804b0e7c /src/svgtiny.c | |
| parent | a285e3942eb288b92a3ba77eaf564d55340b2f9d (diff) | |
| download | libsvgtiny-fd3d01047c69b633d0dfc2f079791c3302971004.tar.gz libsvgtiny-fd3d01047c69b633d0dfc2f079791c3302971004.tar.bz2 | |
fix parsing of whitespace in transform operators
The SVG spec for the transform attribute allows whitespace in places
that were causing the %n specifier in the ssanf to return 0 as the
match failed before it completed the parse.
http://www.w3.org/TR/SVG/coords.html#TransformAttribute
Diffstat (limited to 'src/svgtiny.c')
| -rw-r--r-- | src/svgtiny.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/svgtiny.c b/src/svgtiny.c index 413697c..f02f3d6 100644 --- a/src/svgtiny.c +++ b/src/svgtiny.c @@ -1501,23 +1501,23 @@ void svgtiny_parse_transform(char *s, float *ma, float *mb, a = d = 1; b = c = 0; e = f = 0; - if (sscanf(s, "matrix (%f %f %f %f %f %f) %n", - &a, &b, &c, &d, &e, &f, &n) == 6) + if ((sscanf(s, " matrix (%f %f %f %f %f %f ) %n", + &a, &b, &c, &d, &e, &f, &n) == 6) && (n > 0)) ; - else if (sscanf(s, "translate (%f %f) %n", - &e, &f, &n) == 2) + else if ((sscanf(s, " translate (%f %f ) %n", + &e, &f, &n) == 2) && (n > 0)) ; - else if (sscanf(s, "translate (%f) %n", - &e, &n) == 1) + else if ((sscanf(s, " translate (%f ) %n", + &e, &n) == 1) && (n > 0)) ; - else if (sscanf(s, "scale (%f %f) %n", - &a, &d, &n) == 2) + else if ((sscanf(s, " scale (%f %f ) %n", + &a, &d, &n) == 2) && (n > 0)) ; - else if (sscanf(s, "scale (%f) %n", - &a, &n) == 1) + else if ((sscanf(s, " scale (%f ) %n", + &a, &n) == 1) && (n > 0)) d = a; - else if (sscanf(s, "rotate (%f %f %f) %n", - &angle, &x, &y, &n) == 3) { + else if ((sscanf(s, " rotate (%f %f %f ) %n", + &angle, &x, &y, &n) == 3) && (n > 0)) { angle = angle / 180 * M_PI; a = cos(angle); b = sin(angle); @@ -1525,19 +1525,19 @@ void svgtiny_parse_transform(char *s, float *ma, float *mb, d = cos(angle); e = -x * cos(angle) + y * sin(angle) + x; f = -x * sin(angle) - y * cos(angle) + y; - } else if (sscanf(s, "rotate (%f) %n", - &angle, &n) == 1) { + } else if ((sscanf(s, " rotate (%f ) %n", + &angle, &n) == 1) && (n > 0)) { angle = angle / 180 * M_PI; a = cos(angle); b = sin(angle); c = -sin(angle); d = cos(angle); - } else if (sscanf(s, "skewX (%f) %n", - &angle, &n) == 1) { + } else if ((sscanf(s, " skewX (%f ) %n", + &angle, &n) == 1) && (n > 0)) { angle = angle / 180 * M_PI; c = tan(angle); - } else if (sscanf(s, "skewY (%f) %n", - &angle, &n) == 1) { + } else if ((sscanf(s, " skewY (%f ) %n", + &angle, &n) == 1) && (n > 0)) { angle = angle / 180 * M_PI; b = tan(angle); } else |