more horizontal refactoring

[swftools.git] / lib / modules / swfdraw.c

diff --git a/lib/modules/swfdraw.c b/lib/modules/swfdraw.c
index b54a0e4..ae04aee 100644 (file)
--- a/lib/modules/swfdraw.c
+++ b/lib/modules/swfdraw.c
@@ -1,10 +1,14 @@
 // swfdraw.c
 
+#include "../rfxswf.h"
+
 typedef struct _SWFSHAPEDRAWER
 {
     SHAPE*shape;
     TAG*tag;
     int tagfree;
+    SCOORD firstx;
+    SCOORD firsty;
     SCOORD lastx;
     SCOORD lasty;
     SRECT bbox;
@@ -21,8 +25,7 @@ static void swf_ShapeDrawerClear(drawer_t*draw);
 
 static void swf_ShapeDrawerInit(drawer_t*draw, TAG*tag, int fillstylebits, int linestylebits)
 {
-    SWFSHAPEDRAWER*sdraw = malloc(sizeof(SWFSHAPEDRAWER));
-    memset(sdraw, 0, sizeof(SWFSHAPEDRAWER));
+    SWFSHAPEDRAWER*sdraw = (SWFSHAPEDRAWER*)rfx_calloc(sizeof(SWFSHAPEDRAWER));
     draw->internal = sdraw;
 
     draw->setLineStyle = swf_ShapeDrawerSetLineStyle;
@@ -55,6 +58,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);
@@ -73,21 +81,46 @@ static void swf_ShapeDrawerSetFillStyle(drawer_t*draw, void*style)
 {
     SWFSHAPEDRAWER*sdraw = (SWFSHAPEDRAWER*)draw->internal;
 }
+static void fixEndPoint(drawer_t*draw)
+{
+    SWFSHAPEDRAWER*sdraw = (SWFSHAPEDRAWER*)draw->internal;
+    if(   sdraw->firstx != sdraw->lastx 
+       || sdraw->firsty != sdraw->lasty) {
+       /* fix non-closing shapes */
+       FPOINT to;
+       to.x = sdraw->firstx/20.0;
+       to.y = sdraw->firsty/20.0;
+       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)
 {
     SWFSHAPEDRAWER*sdraw = (SWFSHAPEDRAWER*)draw->internal;
-    int x = to->x*20;
-    int y = to->y*20;
-    swf_ShapeSetMove(sdraw->tag,sdraw->shape,x,y);
-    sdraw->lastx = x;
-    sdraw->lasty = y;
-    draw->pos = *to;
+    int x = floor(to->x*20);
+    int y = floor(to->y*20);
+
+    /* 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)
 {
     SWFSHAPEDRAWER*sdraw = (SWFSHAPEDRAWER*)draw->internal;
-    int x = to->x*20;
-    int y = to->y*20;
+    int x = floor(to->x*20);
+    int y = floor(to->y*20);
     if(sdraw->lastx < sdraw->bbox.xmin) sdraw->bbox.xmin = sdraw->lastx;
     if(sdraw->lasty < sdraw->bbox.ymin) sdraw->bbox.ymin = sdraw->lasty;
     if(sdraw->lastx > sdraw->bbox.xmax) sdraw->bbox.xmax = sdraw->lastx;
@@ -104,10 +137,10 @@ static void swf_ShapeDrawerLineTo(drawer_t*draw, FPOINT * to)
 static void swf_ShapeDrawerSplineTo(drawer_t*draw, FPOINT * c1, FPOINT*  to)
 {
     SWFSHAPEDRAWER*sdraw = (SWFSHAPEDRAWER*)draw->internal;
-    int tx = c1->x*20;
-    int ty = c1->y*20;
-    int x = to->x*20;
-    int y = to->y*20;
+    int tx = floor(c1->x*20);
+    int ty = floor(c1->y*20);
+    int x = floor(to->x*20);
+    int y = floor(to->y*20);
     if(sdraw->lastx < sdraw->bbox.xmin) sdraw->bbox.xmin = sdraw->lastx;
     if(sdraw->lasty < sdraw->bbox.ymin) sdraw->bbox.ymin = sdraw->lasty;
     if(sdraw->lastx > sdraw->bbox.xmax) sdraw->bbox.xmax = sdraw->lastx;
@@ -128,6 +161,11 @@ 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);
+
     if(sdraw->bbox.xmin == SCOORD_MAX) {
        /* no points at all -> empty bounding box */
        sdraw->bbox.xmin = sdraw->bbox.ymin = 
@@ -141,13 +179,13 @@ static void swf_ShapeDrawerClear(drawer_t*draw)
 {
     SWFSHAPEDRAWER*sdraw = (SWFSHAPEDRAWER*)draw->internal;
     if(sdraw->tagfree) {
-       swf_DeleteTag(sdraw->tag);
+       swf_DeleteTag(0, sdraw->tag);
        sdraw->tag = 0;
     }
     swf_ShapeFree(sdraw->shape);
     sdraw->shape = 0;
 
-    free(draw->internal);
+    rfx_free(draw->internal);
     draw->internal = 0;
 }
 
@@ -160,14 +198,14 @@ SRECT swf_ShapeDrawerGetBBox(drawer_t*draw)
 SHAPE* swf_ShapeDrawerToShape(drawer_t*draw)
 {
     SWFSHAPEDRAWER*sdraw = (SWFSHAPEDRAWER*)draw->internal;
-    SHAPE* shape = malloc(sizeof(SHAPE));
+    SHAPE* shape = (SHAPE*)rfx_alloc(sizeof(SHAPE));
     if(!sdraw->isfinished) {
        fprintf(stderr, "Warning: you should Finish() your drawer before calling DrawerToShape");
        swf_ShapeDrawerFinish(draw);
     }
     memcpy(shape, sdraw->shape, sizeof(SHAPE));
     shape->bitlen = (sdraw->tag->len-1)*8;
-    shape->data = (U8*)malloc(sdraw->tag->len-1);
+    shape->data = (U8*)rfx_alloc(sdraw->tag->len-1);
     memcpy(shape->data, &sdraw->tag->data[1], sdraw->tag->len-1);
     return shape;
 }