static void _svgtiny_parse_color(const char *s, svgtiny_colour *c,
struct svgtiny_parse_state *state);
+/**
+ * Set the local externally-stored parts of a parse state.
+ * Call this in functions that made a new state on the stack.
+ * Doesn't make own copy of global state, such as the interned string list.
+ */
+static void svgtiny_setup_state_local(struct svgtiny_parse_state *state)
+{
+ if (state->gradient_x1 != NULL) {
+ dom_string_ref(state->gradient_x1);
+ }
+ if (state->gradient_y1 != NULL) {
+ dom_string_ref(state->gradient_y1);
+ }
+ if (state->gradient_x2 != NULL) {
+ dom_string_ref(state->gradient_x2);
+ }
+ if (state->gradient_y2 != NULL) {
+ dom_string_ref(state->gradient_y2);
+ }
+}
+
+/**
+ * Cleanup the local externally-stored parts of a parse state.
+ * Call this in functions that made a new state on the stack.
+ * Doesn't cleanup global state, such as the interned string list.
+ */
+static void svgtiny_cleanup_state_local(struct svgtiny_parse_state *state)
+{
+ if (state->gradient_x1 != NULL) {
+ dom_string_unref(state->gradient_x1);
+ state->gradient_x1 = NULL;
+ }
+ if (state->gradient_y1 != NULL) {
+ dom_string_unref(state->gradient_y1);
+ state->gradient_y1 = NULL;
+ }
+ if (state->gradient_x2 != NULL) {
+ dom_string_unref(state->gradient_x2);
+ state->gradient_x2 = NULL;
+ }
+ if (state->gradient_y2 != NULL) {
+ dom_string_unref(state->gradient_y2);
+ state->gradient_y2 = NULL;
+ }
+}
+
/**
* Create a new svgtiny_diagram structure.
UNUSED(url);
+ state.gradient_x1 = NULL;
+ state.gradient_y1 = NULL;
+ state.gradient_x2 = NULL;
+ state.gradient_y2 = NULL;
+
parser = dom_xml_parser_create(NULL, NULL,
ignore_msg, NULL, &document);
dom_node_unref(document);
return svgtiny_LIBDOM_ERROR;
}
+ if (svg == NULL) {
+ /* no root svg element */
+ dom_node_unref(document);
+ return svgtiny_SVG_ERROR;
+ }
+
exc = dom_node_get_node_name(svg, &svg_name);
if (exc != DOM_NO_ERR) {
dom_node_unref(svg);
dom_node_unref(document);
cleanup:
- if (state.gradient_x1 != NULL)
- dom_string_unref(state.gradient_x1);
- if (state.gradient_x2 != NULL)
- dom_string_unref(state.gradient_x2);
- if (state.gradient_y1 != NULL)
- dom_string_unref(state.gradient_y1);
- if (state.gradient_y2 != NULL)
- dom_string_unref(state.gradient_y2);
+ svgtiny_cleanup_state_local(&state);
#define SVGTINY_STRING_ACTION2(s,n) \
if (state.interned_##s != NULL) \
dom_string_unref(state.interned_##s);
dom_element *child;
dom_exception exc;
+ svgtiny_setup_state_local(&state);
+
svgtiny_parse_position_attributes(svg, state, &x, &y, &width, &height);
svgtiny_parse_paint_attributes(svg, &state);
svgtiny_parse_font_attributes(svg, &state);
exc = dom_element_get_attribute(svg, state.interned_viewBox,
&view_box);
if (exc != DOM_NO_ERR) {
+ svgtiny_cleanup_state_local(&state);
return svgtiny_LIBDOM_ERROR;
}
exc = dom_node_get_first_child(svg, (dom_node **) (void *) &child);
if (exc != DOM_NO_ERR) {
+ svgtiny_cleanup_state_local(&state);
return svgtiny_LIBDOM_ERROR;
}
while (child != NULL) {
exc = dom_node_get_node_name(child, &nodename);
if (exc != DOM_NO_ERR) {
dom_node_unref(child);
+ svgtiny_cleanup_state_local(&state);
return svgtiny_LIBDOM_ERROR;
}
if (dom_string_caseless_isequal(state.interned_svg,
}
if (code != svgtiny_OK) {
dom_node_unref(child);
+ svgtiny_cleanup_state_local(&state);
return code;
}
exc = dom_node_get_next_sibling(child,
(dom_node **) (void *) &next);
dom_node_unref(child);
if (exc != DOM_NO_ERR) {
+ svgtiny_cleanup_state_local(&state);
return svgtiny_LIBDOM_ERROR;
}
child = next;
}
+ svgtiny_cleanup_state_local(&state);
return svgtiny_OK;
}
svgtiny_code svgtiny_parse_path(dom_element *path,
struct svgtiny_parse_state state)
{
+ svgtiny_code err;
dom_string *path_d_str;
dom_exception exc;
char *s, *path_d;
- float *p;
+ float *p; /* path elemets */
+ unsigned int palloc; /* number of path elements allocated */
unsigned int i;
float last_x = 0, last_y = 0;
float last_cubic_x = 0, last_cubic_y = 0;
float last_quad_x = 0, last_quad_y = 0;
+ float subpath_first_x = 0, subpath_first_y = 0;
+
+ svgtiny_setup_state_local(&state);
svgtiny_parse_paint_attributes(path, &state);
svgtiny_parse_transform_attributes(path, &state);
if (exc != DOM_NO_ERR) {
state.diagram->error_line = -1; /* path->line; */
state.diagram->error_message = "path: error retrieving d attribute";
+ svgtiny_cleanup_state_local(&state);
return svgtiny_SVG_ERROR;
}
if (path_d_str == NULL) {
state.diagram->error_line = -1; /* path->line; */
state.diagram->error_message = "path: missing d attribute";
+ svgtiny_cleanup_state_local(&state);
return svgtiny_SVG_ERROR;
}
- s = path_d = strndup(dom_string_data(path_d_str),
- dom_string_byte_length(path_d_str));
+ /* empty path is permitted it just disables the path */
+ palloc = dom_string_byte_length(path_d_str);
+ if (palloc == 0) {
+ svgtiny_cleanup_state_local(&state);
+ return svgtiny_OK;
+ }
+
+ /* local copy of the path data allowing in-place modification */
+ s = path_d = strndup(dom_string_data(path_d_str), palloc);
dom_string_unref(path_d_str);
if (s == NULL) {
+ svgtiny_cleanup_state_local(&state);
return svgtiny_OUT_OF_MEMORY;
}
- /* allocate space for path: it will never have more elements than d */
- p = malloc(sizeof p[0] * strlen(s));
- if (!p) {
+
+ /* ensure path element allocation is sensibly bounded */
+ if (palloc < 8) {
+ palloc = 8;
+ } else if (palloc > 64) {
+ palloc = palloc / 2;
+ }
+
+ /* allocate initial space for path elements */
+ p = malloc(sizeof p[0] * palloc);
+ if (p == NULL) {
free(path_d);
+ svgtiny_cleanup_state_local(&state);
return svgtiny_OUT_OF_MEMORY;
}
float x, y, x1, y1, x2, y2, rx, ry, rotation, large_arc, sweep;
int n;
+ /* Ensure there is sufficient space for path elements */
+#define ALLOC_PATH_ELEMENTS(NUM_ELEMENTS) \
+ do { \
+ if ((palloc - i) < NUM_ELEMENTS) { \
+ float *tp; \
+ palloc = (palloc * 2) + (palloc / 2); \
+ tp = realloc(p, sizeof p[0] * palloc); \
+ if (tp == NULL) { \
+ free(p); \
+ free(path_d); \
+ svgtiny_cleanup_state_local(&state); \
+ return svgtiny_OUT_OF_MEMORY; \
+ } \
+ p = tp; \
+ } \
+ } while(0)
+
+
/* moveto (M, m), lineto (L, l) (2 arguments) */
if (sscanf(s, " %1[MmLl] %f %f %n", command, &x, &y, &n) == 3) {
/*LOG(("moveto or lineto"));*/
else
plot_command = svgtiny_PATH_LINE;
do {
+ ALLOC_PATH_ELEMENTS(3);
p[i++] = plot_command;
if ('a' <= *command) {
x += last_x;
y += last_y;
}
+ if (plot_command == svgtiny_PATH_MOVE) {
+ subpath_first_x = x;
+ subpath_first_y = y;
+ }
p[i++] = last_cubic_x = last_quad_x = last_x
= x;
p[i++] = last_cubic_y = last_quad_y = last_y
/* closepath (Z, z) (no arguments) */
} else if (sscanf(s, " %1[Zz] %n", command, &n) == 1) {
/*LOG(("closepath"));*/
+ ALLOC_PATH_ELEMENTS(1);
+
p[i++] = svgtiny_PATH_CLOSE;
s += n;
+ last_cubic_x = last_quad_x = last_x = subpath_first_x;
+ last_cubic_y = last_quad_y = last_y = subpath_first_y;
/* horizontal lineto (H, h) (1 argument) */
} else if (sscanf(s, " %1[Hh] %f %n", command, &x, &n) == 2) {
/*LOG(("horizontal lineto"));*/
do {
+ ALLOC_PATH_ELEMENTS(3);
+
p[i++] = svgtiny_PATH_LINE;
if (*command == 'h')
x += last_x;
} else if (sscanf(s, " %1[Vv] %f %n", command, &y, &n) == 2) {
/*LOG(("vertical lineto"));*/
do {
+ ALLOC_PATH_ELEMENTS(3);
+
p[i++] = svgtiny_PATH_LINE;
if (*command == 'v')
y += last_y;
&x1, &y1, &x2, &y2, &x, &y, &n) == 7) {
/*LOG(("curveto"));*/
do {
+ ALLOC_PATH_ELEMENTS(7);
+
p[i++] = svgtiny_PATH_BEZIER;
if (*command == 'c') {
x1 += last_x;
&x2, &y2, &x, &y, &n) == 5) {
/*LOG(("shorthand/smooth curveto"));*/
do {
+ ALLOC_PATH_ELEMENTS(7);
+
p[i++] = svgtiny_PATH_BEZIER;
x1 = last_x + (last_x - last_cubic_x);
y1 = last_y + (last_y - last_cubic_y);
&x1, &y1, &x, &y, &n) == 5) {
/*LOG(("quadratic Bezier curveto"));*/
do {
+ ALLOC_PATH_ELEMENTS(7);
+
p[i++] = svgtiny_PATH_BEZIER;
last_quad_x = x1;
last_quad_y = y1;
&x, &y, &n) == 3) {
/*LOG(("shorthand/smooth quadratic Bezier curveto"));*/
do {
+ ALLOC_PATH_ELEMENTS(7);
+
p[i++] = svgtiny_PATH_BEZIER;
x1 = last_x + (last_x - last_quad_x);
y1 = last_y + (last_y - last_quad_y);
&rx, &ry, &rotation, &large_arc, &sweep,
&x, &y, &n) == 8) {
do {
+ ALLOC_PATH_ELEMENTS(3);
+
p[i++] = svgtiny_PATH_LINE;
if (*command == 'a') {
x += last_x;
if (i <= 4) {
/* no real segments in path */
free(p);
+ svgtiny_cleanup_state_local(&state);
return svgtiny_OK;
}
- return svgtiny_add_path(p, i, &state);
+ /* resize path element array to not be over allocated */
+ if (palloc != i) {
+ float *tp;
+
+ /* try the resize, if it fails just continue to use the old
+ * allocation
+ */
+ tp = realloc(p, sizeof p[0] * i);
+ if (tp != NULL) {
+ p = tp;
+ }
+ }
+
+ err = svgtiny_add_path(p, i, &state);
+
+ svgtiny_cleanup_state_local(&state);
+
+ return err;
}
svgtiny_code svgtiny_parse_rect(dom_element *rect,
struct svgtiny_parse_state state)
{
+ svgtiny_code err;
float x, y, width, height;
float *p;
+ svgtiny_setup_state_local(&state);
+
svgtiny_parse_position_attributes(rect, state,
&x, &y, &width, &height);
svgtiny_parse_paint_attributes(rect, &state);
svgtiny_parse_transform_attributes(rect, &state);
p = malloc(13 * sizeof p[0]);
- if (!p)
+ if (!p) {
+ svgtiny_cleanup_state_local(&state);
return svgtiny_OUT_OF_MEMORY;
+ }
p[0] = svgtiny_PATH_MOVE;
p[1] = x;
p[11] = y + height;
p[12] = svgtiny_PATH_CLOSE;
- return svgtiny_add_path(p, 13, &state);
+ err = svgtiny_add_path(p, 13, &state);
+
+ svgtiny_cleanup_state_local(&state);
+
+ return err;
}
svgtiny_code svgtiny_parse_circle(dom_element *circle,
struct svgtiny_parse_state state)
{
+ svgtiny_code err;
float x = 0, y = 0, r = -1;
float *p;
dom_string *attr;
dom_exception exc;
+ svgtiny_setup_state_local(&state);
+
exc = dom_element_get_attribute(circle, state.interned_cx, &attr);
- if (exc != DOM_NO_ERR)
+ if (exc != DOM_NO_ERR) {
+ svgtiny_cleanup_state_local(&state);
return svgtiny_LIBDOM_ERROR;
+ }
if (attr != NULL) {
x = svgtiny_parse_length(attr, state.viewport_width, state);
}
dom_string_unref(attr);
exc = dom_element_get_attribute(circle, state.interned_cy, &attr);
- if (exc != DOM_NO_ERR)
+ if (exc != DOM_NO_ERR) {
+ svgtiny_cleanup_state_local(&state);
return svgtiny_LIBDOM_ERROR;
+ }
if (attr != NULL) {
y = svgtiny_parse_length(attr, state.viewport_height, state);
}
dom_string_unref(attr);
exc = dom_element_get_attribute(circle, state.interned_r, &attr);
- if (exc != DOM_NO_ERR)
+ if (exc != DOM_NO_ERR) {
+ svgtiny_cleanup_state_local(&state);
return svgtiny_LIBDOM_ERROR;
+ }
if (attr != NULL) {
r = svgtiny_parse_length(attr, state.viewport_width, state);
}
if (r < 0) {
state.diagram->error_line = -1; /* circle->line; */
state.diagram->error_message = "circle: r missing or negative";
+ svgtiny_cleanup_state_local(&state);
return svgtiny_SVG_ERROR;
}
- if (r == 0)
+ if (r == 0) {
+ svgtiny_cleanup_state_local(&state);
return svgtiny_OK;
+ }
p = malloc(32 * sizeof p[0]);
- if (!p)
+ if (!p) {
+ svgtiny_cleanup_state_local(&state);
return svgtiny_OUT_OF_MEMORY;
+ }
p[0] = svgtiny_PATH_MOVE;
p[1] = x + r;
p[29] = x + r;
p[30] = y;
p[31] = svgtiny_PATH_CLOSE;
+
+ err = svgtiny_add_path(p, 32, &state);
+
+ svgtiny_cleanup_state_local(&state);
- return svgtiny_add_path(p, 32, &state);
+ return err;
}
svgtiny_code svgtiny_parse_ellipse(dom_element *ellipse,
struct svgtiny_parse_state state)
{
+ svgtiny_code err;
float x = 0, y = 0, rx = -1, ry = -1;
float *p;
dom_string *attr;
dom_exception exc;
+ svgtiny_setup_state_local(&state);
+
exc = dom_element_get_attribute(ellipse, state.interned_cx, &attr);
- if (exc != DOM_NO_ERR)
+ if (exc != DOM_NO_ERR) {
+ svgtiny_cleanup_state_local(&state);
return svgtiny_LIBDOM_ERROR;
+ }
if (attr != NULL) {
x = svgtiny_parse_length(attr, state.viewport_width, state);
}
dom_string_unref(attr);
exc = dom_element_get_attribute(ellipse, state.interned_cy, &attr);
- if (exc != DOM_NO_ERR)
+ if (exc != DOM_NO_ERR) {
+ svgtiny_cleanup_state_local(&state);
return svgtiny_LIBDOM_ERROR;
+ }
if (attr != NULL) {
y = svgtiny_parse_length(attr, state.viewport_height, state);
}
dom_string_unref(attr);
exc = dom_element_get_attribute(ellipse, state.interned_rx, &attr);
- if (exc != DOM_NO_ERR)
+ if (exc != DOM_NO_ERR) {
+ svgtiny_cleanup_state_local(&state);
return svgtiny_LIBDOM_ERROR;
+ }
if (attr != NULL) {
rx = svgtiny_parse_length(attr, state.viewport_width, state);
}
dom_string_unref(attr);
exc = dom_element_get_attribute(ellipse, state.interned_ry, &attr);
- if (exc != DOM_NO_ERR)
+ if (exc != DOM_NO_ERR) {
+ svgtiny_cleanup_state_local(&state);
return svgtiny_LIBDOM_ERROR;
+ }
if (attr != NULL) {
ry = svgtiny_parse_length(attr, state.viewport_width, state);
}
state.diagram->error_line = -1; /* ellipse->line; */
state.diagram->error_message = "ellipse: rx or ry missing "
"or negative";
+ svgtiny_cleanup_state_local(&state);
return svgtiny_SVG_ERROR;
}
- if (rx == 0 || ry == 0)
+ if (rx == 0 || ry == 0) {
+ svgtiny_cleanup_state_local(&state);
return svgtiny_OK;
+ }
p = malloc(32 * sizeof p[0]);
- if (!p)
+ if (!p) {
+ svgtiny_cleanup_state_local(&state);
return svgtiny_OUT_OF_MEMORY;
+ }
p[0] = svgtiny_PATH_MOVE;
p[1] = x + rx;
p[30] = y;
p[31] = svgtiny_PATH_CLOSE;
- return svgtiny_add_path(p, 32, &state);
+ err = svgtiny_add_path(p, 32, &state);
+
+ svgtiny_cleanup_state_local(&state);
+
+ return err;
}
svgtiny_code svgtiny_parse_line(dom_element *line,
struct svgtiny_parse_state state)
{
+ svgtiny_code err;
float x1 = 0, y1 = 0, x2 = 0, y2 = 0;
float *p;
dom_string *attr;
dom_exception exc;
+ svgtiny_setup_state_local(&state);
+
exc = dom_element_get_attribute(line, state.interned_x1, &attr);
- if (exc != DOM_NO_ERR)
+ if (exc != DOM_NO_ERR) {
+ svgtiny_cleanup_state_local(&state);
return svgtiny_LIBDOM_ERROR;
+ }
if (attr != NULL) {
x1 = svgtiny_parse_length(attr, state.viewport_width, state);
}
dom_string_unref(attr);
exc = dom_element_get_attribute(line, state.interned_y1, &attr);
- if (exc != DOM_NO_ERR)
+ if (exc != DOM_NO_ERR) {
+ svgtiny_cleanup_state_local(&state);
return svgtiny_LIBDOM_ERROR;
+ }
if (attr != NULL) {
y1 = svgtiny_parse_length(attr, state.viewport_height, state);
}
dom_string_unref(attr);
exc = dom_element_get_attribute(line, state.interned_x2, &attr);
- if (exc != DOM_NO_ERR)
+ if (exc != DOM_NO_ERR) {
+ svgtiny_cleanup_state_local(&state);
return svgtiny_LIBDOM_ERROR;
+ }
if (attr != NULL) {
x2 = svgtiny_parse_length(attr, state.viewport_width, state);
}
dom_string_unref(attr);
exc = dom_element_get_attribute(line, state.interned_y2, &attr);
- if (exc != DOM_NO_ERR)
+ if (exc != DOM_NO_ERR) {
+ svgtiny_cleanup_state_local(&state);
return svgtiny_LIBDOM_ERROR;
+ }
if (attr != NULL) {
y2 = svgtiny_parse_length(attr, state.viewport_height, state);
}
svgtiny_parse_transform_attributes(line, &state);
p = malloc(7 * sizeof p[0]);
- if (!p)
+ if (!p) {
+ svgtiny_cleanup_state_local(&state);
return svgtiny_OUT_OF_MEMORY;
+ }
p[0] = svgtiny_PATH_MOVE;
p[1] = x1;
p[5] = y2;
p[6] = svgtiny_PATH_CLOSE;
- return svgtiny_add_path(p, 7, &state);
+ err = svgtiny_add_path(p, 7, &state);
+
+ svgtiny_cleanup_state_local(&state);
+
+ return err;
}
svgtiny_code svgtiny_parse_poly(dom_element *poly,
struct svgtiny_parse_state state, bool polygon)
{
+ svgtiny_code err;
dom_string *points_str;
dom_exception exc;
char *s, *points;
float *p;
unsigned int i;
+ svgtiny_setup_state_local(&state);
+
svgtiny_parse_paint_attributes(poly, &state);
svgtiny_parse_transform_attributes(poly, &state);
exc = dom_element_get_attribute(poly, state.interned_points,
&points_str);
- if (exc != DOM_NO_ERR)
+ if (exc != DOM_NO_ERR) {
+ svgtiny_cleanup_state_local(&state);
return svgtiny_LIBDOM_ERROR;
+ }
if (points_str == NULL) {
state.diagram->error_line = -1; /* poly->line; */
state.diagram->error_message =
"polyline/polygon: missing points attribute";
+ svgtiny_cleanup_state_local(&state);
return svgtiny_SVG_ERROR;
}
dom_string_byte_length(points_str));
dom_string_unref(points_str);
/* read points attribute */
- if (s == NULL)
+ if (s == NULL) {
+ svgtiny_cleanup_state_local(&state);
return svgtiny_OUT_OF_MEMORY;
+ }
/* allocate space for path: it will never have more elements than s */
p = malloc(sizeof p[0] * strlen(s));
if (!p) {
free(points);
+ svgtiny_cleanup_state_local(&state);
return svgtiny_OUT_OF_MEMORY;
}
free(points);
- return svgtiny_add_path(p, i, &state);
+ err = svgtiny_add_path(p, i, &state);
+
+ svgtiny_cleanup_state_local(&state);
+
+ return err;
}
dom_node *child;
dom_exception exc;
+ svgtiny_setup_state_local(&state);
+
svgtiny_parse_position_attributes(text, state,
&x, &y, &width, &height);
svgtiny_parse_font_attributes(text, &state);
style.font_size.value.length.value *= state.ctm.a;*/
exc = dom_node_get_first_child(text, &child);
- if (exc != DOM_NO_ERR)
+ if (exc != DOM_NO_ERR) {
return svgtiny_LIBDOM_ERROR;
+ svgtiny_cleanup_state_local(&state);
+ }
while (child != NULL) {
dom_node *next;
dom_node_type nodetype;
exc = dom_node_get_node_type(child, &nodetype);
if (exc != DOM_NO_ERR) {
dom_node_unref(child);
+ svgtiny_cleanup_state_local(&state);
return svgtiny_LIBDOM_ERROR;
}
if (nodetype == DOM_ELEMENT_NODE) {
exc = dom_node_get_node_name(child, &nodename);
if (exc != DOM_NO_ERR) {
dom_node_unref(child);
+ svgtiny_cleanup_state_local(&state);
return svgtiny_LIBDOM_ERROR;
}
if (dom_string_caseless_isequal(nodename,
dom_string *content;
if (shape == NULL) {
dom_node_unref(child);
+ svgtiny_cleanup_state_local(&state);
return svgtiny_OUT_OF_MEMORY;
}
exc = dom_text_get_whole_text(child, &content);
if (exc != DOM_NO_ERR) {
dom_node_unref(child);
+ svgtiny_cleanup_state_local(&state);
return svgtiny_LIBDOM_ERROR;
}
if (content != NULL) {
if (code != svgtiny_OK) {
dom_node_unref(child);
+ svgtiny_cleanup_state_local(&state);
return code;
}
exc = dom_node_get_next_sibling(child, &next);
dom_node_unref(child);
- if (exc != DOM_NO_ERR)
+ if (exc != DOM_NO_ERR) {
+ svgtiny_cleanup_state_local(&state);
return svgtiny_LIBDOM_ERROR;
+ }
child = next;
}
+ svgtiny_cleanup_state_local(&state);
+
return svgtiny_OK;
}
*rparen = 0;
svgtiny_find_gradient(id, state);
free(id);
- fprintf(stderr, "linear_gradient_stop_count %i\n",
- state->linear_gradient_stop_count);
if (state->linear_gradient_stop_count == 0)
*c = svgtiny_TRANSPARENT;
else if (state->linear_gradient_stop_count == 1)
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);
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