X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Fart%2Fart_vpath.c;h=454ce993eb0eb19a7a5e999d43077b82f343cf96;hp=fa7b903d11cc11ebbbe7880691c8857f3b8339dd;hb=b93de056e0b79f57c8f8fe22985b166c7d2c3dc3;hpb=a3eecab9e8f6a1b0b887f1bd082bd064f01ecffd diff --git a/lib/art/art_vpath.c b/lib/art/art_vpath.c index fa7b903..454ce99 100644 --- a/lib/art/art_vpath.c +++ b/lib/art/art_vpath.c @@ -81,7 +81,7 @@ art_vpath_new_circle (double x, double y, double r) ArtVpath *vec; double theta; - vec = art_new (ArtVpath, CIRCLE_STEPS + 2); + vec = (ArtVpath*)art_new (ArtVpath, CIRCLE_STEPS + 2); for (i = 0; i < CIRCLE_STEPS + 1; i++) { @@ -112,25 +112,25 @@ art_vpath_affine_transform (const ArtVpath *src, const double matrix[6]) { int i; int size; - ArtVpath *new; + ArtVpath *xnew; double x, y; for (i = 0; src[i].code != ART_END; i++); size = i; - new = art_new (ArtVpath, size + 1); + xnew = (ArtVpath*)art_new (ArtVpath, size + 1); for (i = 0; i < size; i++) { - new[i].code = src[i].code; + xnew[i].code = src[i].code; x = src[i].x; y = src[i].y; - new[i].x = matrix[0] * x + matrix[2] * y + matrix[4]; - new[i].y = matrix[1] * x + matrix[3] * y + matrix[5]; + xnew[i].x = matrix[0] * x + matrix[2] * y + matrix[4]; + xnew[i].y = matrix[1] * x + matrix[3] * y + matrix[5]; } - new[i].code = ART_END; + xnew[i].code = ART_END; - return new; + return xnew; } /** @@ -201,7 +201,7 @@ art_vpath_perturb (ArtVpath *src) { int i; int size; - ArtVpath *new; + ArtVpath *xnew; double x, y; double x_start, y_start; int open; @@ -209,14 +209,14 @@ art_vpath_perturb (ArtVpath *src) for (i = 0; src[i].code != ART_END; i++); size = i; - new = art_new (ArtVpath, size + 1); + xnew = (ArtVpath*)art_new (ArtVpath, size + 1); x_start = 0; y_start = 0; open = 0; for (i = 0; i < size; i++) { - new[i].code = src[i].code; + xnew[i].code = src[i].code; x = src[i].x + (PERTURBATION * rand ()) / RAND_MAX - PERTURBATION * 0.5; y = src[i].y + (PERTURBATION * rand ()) / RAND_MAX - PERTURBATION * 0.5; if (src[i].code == ART_MOVETO) @@ -232,10 +232,10 @@ art_vpath_perturb (ArtVpath *src) x = x_start; y = y_start; } - new[i].x = x; - new[i].y = y; + xnew[i].x = x; + xnew[i].y = y; } - new[i].code = ART_END; + xnew[i].code = ART_END; - return new; + return xnew; }