several fixes

[swftools.git] / lib / gfxtools.c

diff --git a/lib/gfxtools.c b/lib/gfxtools.c
index e075059..aec892a 100644 (file)
--- a/lib/gfxtools.c
+++ b/lib/gfxtools.c
@@ -37,6 +37,12 @@ static void linedraw_moveTo(gfxdrawer_t*d, gfxcoord_t x, gfxcoord_t y)
     linedraw_internal_t*i = (linedraw_internal_t*)d->internal;
     gfxline_t*l = rfx_alloc(sizeof(gfxline_t));
     l->type = gfx_moveTo;
+    if((int)((d->x * 5120) == (int)(x * 5120)) &&
+       (int)((d->y * 5120) == (int)(y * 5120))) {
+       /* never mind- we're already there */
+       return;
+
+    }
     d->x = l->x = x;
     d->y = l->y = y;
     l->next = 0;
@@ -448,6 +454,16 @@ static int approximate3(const cspline_t*s, qspline_t*q, int size, double quality
     return num;
 }
 
+void gfxdraw_conicTo(gfxdrawer_t*draw, double cx, double cy, double tox, double toy)
+{
+    double c1x = (draw->x + 2 * cx) / 3;
+    double c1y = (draw->y + 2 * cy) / 3;
+    double c2x = (2 * cx + tox) / 3;
+    double c2y = (2 * cy + toy) / 3;
+    gfxdraw_cubicTo(draw, c1x, c1y, c2x, c2y, tox, toy);
+}
+
+
 void gfxdraw_cubicTo(gfxdrawer_t*draw, double c1x, double c1y, double c2x, double c2y, double x, double y)
 {
     qspline_t q[128];
@@ -467,8 +483,8 @@ void gfxdraw_cubicTo(gfxdrawer_t*draw, double c1x, double c1y, double c2x, doubl
     num = approximate3(&c, q, 128, maxerror*maxerror);
 
     for(t=0;t<num;t++) {
-       FPOINT mid;
-       FPOINT to;
+       gfxpoint_t mid;
+       gfxpoint_t to;
        mid.x = q[t].control.x;
        mid.y = q[t].control.y;
        to.x = q[t].end.x;
@@ -479,7 +495,7 @@ void gfxdraw_cubicTo(gfxdrawer_t*draw, double c1x, double c1y, double c2x, doubl
 
 gfxbbox_t gfxbbox_expand_to_point(gfxbbox_t box, gfxcoord_t x, gfxcoord_t y)
 {
-    if(box.xmin==0 || box.ymin==0 || box.xmax==0 || box.ymax==0) {
+    if(box.xmin==0 && box.ymin==0 && box.xmax==0 && box.ymax==0) {
        box.xmin = x;
        box.ymin = y;
        box.xmax = x;
@@ -517,23 +533,30 @@ gfxbbox_t gfxline_getbbox(gfxline_t*line)
            last = 0;
        }
        x = line->x;
-       y = line->x;
+       y = line->y;
        line = line->next;
     }
     return bbox;
 }
 
-void gfxline_dump(gfxline_t*line, FILE*fi)
+void gfxline_dump(gfxline_t*line, FILE*fi, char*prefix)
 {
     while(line) {
        if(line->type == gfx_moveTo) {
-           fprintf(fi, "moveTo %.2f %.2f\n", line->x, line->y);
+           fprintf(fi, "%smoveTo %.2f %.2f\n", prefix, line->x, line->y);
        } else if(line->type == gfx_lineTo) {
-           fprintf(fi, "lineTo %.2f %.2f\n", line->x, line->y);
+           fprintf(fi, "%slineTo %.2f %.2f\n", prefix, line->x, line->y);
        } else if(line->type == gfx_splineTo) {
-           fprintf(fi, "splineTo (%.2f %.2f) %.2f %.2f\n", line->sx, line->sy, line->x, line->y);
+           fprintf(fi, "%ssplineTo (%.2f %.2f) %.2f %.2f\n", prefix, line->sx, line->sy, line->x, line->y);
        }
        line = line->next;
     }
 }
 
+void gfxline_append(gfxline_t*line1, gfxline_t*line2)
+{
+    while(line1) {
+       line1 = line1->next;
+    }
+    line1->next = line2;
+}