X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fmodules%2Fswfdraw.c;h=723b253dbd0b12c07eceb6094c882354c22c6c2d;hb=eed40b7b7e7b51945654ee0d41e09d40510a6e18;hp=f9a28829f5cfd593ea326c115048271ddc01ac6e;hpb=19c7bc67ec99913b1f0ec52c5f98d56ef0345c3b;p=swftools.git

diff --git a/lib/modules/swfdraw.c b/lib/modules/swfdraw.c
index f9a2882..723b253 100644
--- a/lib/modules/swfdraw.c
+++ b/lib/modules/swfdraw.c
@@ -57,6 +57,11 @@ static void swf_ShapeDrawerInit(drawer_t*draw, TAG*tag, int fillstylebits, int l
     swf_ShapeSetStyle(sdraw->tag,sdraw->shape,linestylebits?1:0,fillstylebits?1:0,0/*?*/);
 }
 
+void swf_Shape10DrawerInit(drawer_t*draw, TAG*tag)
+{
+    swf_ShapeDrawerInit(draw, tag, 0, 1);
+}
+
 void swf_Shape01DrawerInit(drawer_t*draw, TAG*tag)
 {
     swf_ShapeDrawerInit(draw, tag, 1, 0);
@@ -81,11 +86,11 @@ static void fixEndPoint(drawer_t*draw)
     if(   sdraw->firstx != sdraw->lastx 
        || sdraw->firsty != sdraw->lasty) {
 	/* fix non-closing shapes */
-	/* TODO: do this only if the shape is filled */
 	FPOINT to;
 	to.x = sdraw->firstx/20.0;
 	to.y = sdraw->firsty/20.0;
-	draw->lineTo(draw, &to);
+	if(sdraw->shape->bits.fill) // do this only if the shape is filled
+	    draw->lineTo(draw, &to);
     }
 }
 static void swf_ShapeDrawerMoveTo(drawer_t*draw, FPOINT * to)
@@ -93,13 +98,22 @@ static void swf_ShapeDrawerMoveTo(drawer_t*draw, FPOINT * to)
     SWFSHAPEDRAWER*sdraw = (SWFSHAPEDRAWER*)draw->internal;
     int x = to->x*20;
     int y = to->y*20;
-    if(sdraw->lastx != x || sdraw->lasty != y) {
+
+    /* we need to write moveto always- it
+       might be that it signals the end of a polygon, otherwise
+       we would end up connecting two polygons which should
+       be seperate 
+	TODO: check if the last operation was a moveTo- if
+	      yes we *can* skip it.
+     */
+
+    //if(sdraw->lastx != x || sdraw->lasty != y) {
 	fixEndPoint(draw);
 	swf_ShapeSetMove(sdraw->tag,sdraw->shape,x,y);
 	sdraw->firstx = sdraw->lastx = x;
 	sdraw->firsty = sdraw->lasty = y;
 	draw->pos = *to;
-    }
+    //}
 }
 static void swf_ShapeDrawerLineTo(drawer_t*draw, FPOINT * to)
 {
@@ -146,6 +160,8 @@ static void swf_ShapeDrawerSplineTo(drawer_t*draw, FPOINT * c1, FPOINT*  to)
 static void swf_ShapeDrawerFinish(drawer_t*draw)
 {
     SWFSHAPEDRAWER*sdraw = (SWFSHAPEDRAWER*)draw->internal;
+    if(sdraw->isfinished)
+	return;
 	
     fixEndPoint(draw);