dom_node_unref(document);
return svgtiny_LIBDOM_ERROR;
}
- if (svg == NULL) {
- /* no root svg element */
- dom_node_unref(document);
+ 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_exception exc;
char *s, *path_d;
float *p; /* path elemets */
- unsigned int palloc; /* number of path elements allocated */
+ 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;
return svgtiny_SVG_ERROR;
}
- /* empty path is permitted it just disables the path */
- palloc = dom_string_byte_length(path_d_str);
- if (palloc == 0) {
+ /* empty path is permitted it just disables the path */
+ palloc = dom_string_byte_length(path_d_str);
+ if (palloc == 0) {
dom_string_unref(path_d_str);
svgtiny_cleanup_state_local(&state);
return svgtiny_OK;
- }
+ }
- /* local copy of the path data allowing in-place modification */
+ /* 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) {
return svgtiny_OUT_OF_MEMORY;
}
- /* ensure path element allocation is sensibly bounded */
- if (palloc < 8) {
- palloc = 8;
- } else if (palloc > 64) {
- palloc = palloc / 2;
- }
+ /* 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);
float x, y, x1, y1, x2, y2, rx, ry, rotation, large_arc, sweep;
int n;
- /* Ensure there is sufficient space for path elements */
+ /* Ensure there is sufficient space for path elements */
#define ALLOC_PATH_ELEMENTS(NUM_ELEMENTS) \
do { \
if ((palloc - i) < NUM_ELEMENTS) { \
else
plot_command = svgtiny_PATH_LINE;
do {
- ALLOC_PATH_ELEMENTS(3);
+ ALLOC_PATH_ELEMENTS(3);
p[i++] = plot_command;
if ('a' <= *command) {
x += last_x;
/* closepath (Z, z) (no arguments) */
} else if (sscanf(s, " %1[Zz] %n", command, &n) == 1) {
/*LOG(("closepath"));*/
- ALLOC_PATH_ELEMENTS(1);
+ ALLOC_PATH_ELEMENTS(1);
p[i++] = svgtiny_PATH_CLOSE;
s += n;
} else if (sscanf(s, " %1[Hh] %f %n", command, &x, &n) == 2) {
/*LOG(("horizontal lineto"));*/
do {
- ALLOC_PATH_ELEMENTS(3);
+ ALLOC_PATH_ELEMENTS(3);
p[i++] = svgtiny_PATH_LINE;
if (*command == 'h')
} else if (sscanf(s, " %1[Vv] %f %n", command, &y, &n) == 2) {
/*LOG(("vertical lineto"));*/
do {
- ALLOC_PATH_ELEMENTS(3);
+ ALLOC_PATH_ELEMENTS(3);
p[i++] = svgtiny_PATH_LINE;
if (*command == 'v')
&x1, &y1, &x2, &y2, &x, &y, &n) == 7) {
/*LOG(("curveto"));*/
do {
- ALLOC_PATH_ELEMENTS(7);
+ ALLOC_PATH_ELEMENTS(7);
p[i++] = svgtiny_PATH_BEZIER;
if (*command == 'c') {
&x2, &y2, &x, &y, &n) == 5) {
/*LOG(("shorthand/smooth curveto"));*/
do {
- ALLOC_PATH_ELEMENTS(7);
+ ALLOC_PATH_ELEMENTS(7);
p[i++] = svgtiny_PATH_BEZIER;
x1 = last_x + (last_x - last_cubic_x);
&x1, &y1, &x, &y, &n) == 5) {
/*LOG(("quadratic Bezier curveto"));*/
do {
- ALLOC_PATH_ELEMENTS(7);
+ ALLOC_PATH_ELEMENTS(7);
p[i++] = svgtiny_PATH_BEZIER;
last_quad_x = x1;
&x, &y, &n) == 3) {
/*LOG(("shorthand/smooth quadratic Bezier curveto"));*/
do {
- ALLOC_PATH_ELEMENTS(7);
+ ALLOC_PATH_ELEMENTS(7);
p[i++] = svgtiny_PATH_BEZIER;
x1 = last_x + (last_x - last_quad_x);
return svgtiny_OK;
}
- /* resize path element array to not be over allocated */
- if (palloc != i) {
- float *tp;
+ /* 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;
- }
- }
+ /* 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);
p[i++] = x;
p[i++] = y;
s += n;
- } else {
+ } else {
break;
- }
- }
- if (polygon)
+ }
+ }
+ if (polygon)
p[i++] = svgtiny_PATH_CLOSE;
free(points);
/* state.ctm.e = px - state.origin_x; */
/* state.ctm.f = py - state.origin_y; */
- exc = dom_node_get_first_child(text, &child);
+ exc = dom_node_get_first_child(text, &child);
if (exc != DOM_NO_ERR) {
return svgtiny_LIBDOM_ERROR;
svgtiny_cleanup_state_local(&state);
if (strcmp((const char *) attr->name, "font-size") == 0) {
/* TODO */
}
- }
+ }
#endif
}
e = f = 0;
n = 0;
if ((sscanf(s, " matrix (%f %f %f %f %f %f ) %n",
- &a, &b, &c, &d, &e, &f, &n) == 6) && (n > 0))
+ &a, &b, &c, &d, &e, &f, &n) == 6) && (n > 0))
;
else if ((sscanf(s, " translate (%f %f ) %n",
- &e, &f, &n) == 2) && (n > 0))
+ &e, &f, &n) == 2) && (n > 0))
;
else if ((sscanf(s, " translate (%f ) %n",
- &e, &n) == 1) && (n > 0))
+ &e, &n) == 1) && (n > 0))
;
else if ((sscanf(s, " scale (%f %f ) %n",
- &a, &d, &n) == 2) && (n > 0))
+ &a, &d, &n) == 2) && (n > 0))
;
else if ((sscanf(s, " scale (%f ) %n",
- &a, &n) == 1) && (n > 0))
+ &a, &n) == 1) && (n > 0))
d = a;
else if ((sscanf(s, " rotate (%f %f %f ) %n",
- &angle, &x, &y, &n) == 3) && (n > 0)) {
+ &angle, &x, &y, &n) == 3) && (n > 0)) {
angle = angle / 180 * M_PI;
a = cos(angle);
b = sin(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) && (n > 0)) {
+ &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) && (n > 0)) {
+ &angle, &n) == 1) && (n > 0)) {
angle = angle / 180 * M_PI;
c = tan(angle);
} else if ((sscanf(s, " skewY (%f ) %n",
- &angle, &n) == 1) && (n > 0)) {
+ &angle, &n) == 1) && (n > 0)) {
angle = angle / 180 * M_PI;
b = tan(angle);
} else
projects / libsvgtiny.git / blobdiff