optimized shape generation- omit moveto(0,0)

[swftools.git] / lib / devices / swf.c

diff --git a/lib/devices/swf.c b/lib/devices/swf.c
index 1ca808b..6f3f6f0 100644 (file)
--- a/lib/devices/swf.c
+++ b/lib/devices/swf.c
@@ -82,6 +82,7 @@ typedef struct _swfoutput_internal
     int config_filloverlap;
     int config_protect;
     int config_bboxvars;
+    int config_disable_polygon_conversion;
     RGBA config_linkcolor;
     float config_minlinewidth;
     double config_caplinewidth;
@@ -383,15 +384,18 @@ static void splineto(gfxdevice_t*dev, TAG*tag, plotxy_t control,plotxy_t end)
     i->swflastx += ex;
     i->swflasty += ey;
     
-    if(cx || cy || ex || ey) {
-       swf_ShapeSetCurve(tag, i->shape, cx,cy,ex,ey);
-       addPointToBBox(dev, lastlastx   ,lastlasty   );
-       addPointToBBox(dev, lastlastx+cx,lastlasty+cy);
-       addPointToBBox(dev, lastlastx+cx+ex,lastlasty+cy+ey);
-    }/* else if(!i->fill) {
-       // treat splines of length 0 as plots
-       plot(dev, lastlastx, lastlasty, tag);
-    }*/
+    if((cx || cy) && (ex || ey)) {
+        swf_ShapeSetCurve(tag, i->shape, cx,cy,ex,ey);
+        addPointToBBox(dev, lastlastx   ,lastlasty   );
+        addPointToBBox(dev, lastlastx+cx,lastlasty+cy);
+        addPointToBBox(dev, lastlastx+cx+ex,lastlasty+cy+ey);
+    } else if(cx || cy || ex || ey) {
+        swf_ShapeSetLine(tag, i->shape, cx+ex,cy+ey);
+        addPointToBBox(dev, lastlastx   ,lastlasty   );
+        addPointToBBox(dev, lastlastx+cx,lastlasty+cy);
+        addPointToBBox(dev, lastlastx+cx+ex,lastlasty+cy+ey);
+    }
+
     i->shapeisempty = 0;
 }
 
@@ -413,7 +417,7 @@ void resetdrawer(gfxdevice_t*dev)
 static void stopFill(gfxdevice_t*dev)
 {
     swfoutput_internal*i = (swfoutput_internal*)dev->internal;
-    if(i->lastwasfill)
+    if(i->lastwasfill!=0)
     {
        swf_ShapeSetStyle(i->tag,i->shape,i->linestyleid,0x8000,0);
        i->fillstylechanged = 1;
@@ -423,7 +427,7 @@ static void stopFill(gfxdevice_t*dev)
 static void startFill(gfxdevice_t*dev)
 {
     swfoutput_internal*i = (swfoutput_internal*)dev->internal;
-    if(!i->lastwasfill)
+    if(i->lastwasfill!=1)
     {
        swf_ShapeSetStyle(i->tag,i->shape,0x8000,i->fillstyleid,0);
        i->fillstylechanged = 1;
@@ -954,9 +958,10 @@ static void startshape(gfxdevice_t*dev)
     swf_SetShapeBits(i->tag,i->shape);
 
     /* TODO: do we really need this? */
-    swf_ShapeSetAll(i->tag,i->shape,/*x*/0,/*y*/0,i->linestyleid,0,0);
-    i->swflastx=i->swflasty=0;
-    i->lastwasfill = 0;
+    //swf_ShapeSetAll(i->tag,i->shape,/*x*/0,/*y*/0,i->linestyleid,0,0);
+    //swf_ShapeSetAll(i->tag,i->shape,/*x*/UNDEFINED_COORD,/*y*/UNDEFINED_COORD,i->linestyleid,0,0);
+    i->swflastx=i->swflasty=UNDEFINED_COORD;
+    i->lastwasfill = -1;
     i->shapeisempty = 1;
 }
 
@@ -1006,7 +1011,7 @@ void cancelshape(gfxdevice_t*dev)
     i->shapeid = -1;
     i->bboxrectpos = -1;
 
-    i->currentswfid--;
+//    i->currentswfid--; // this was an *exceptionally* bad idea
 }
 
 void fixAreas(gfxdevice_t*dev)
@@ -1039,6 +1044,7 @@ void fixAreas(gfxdevice_t*dev)
        if(i->linewidth==0) i->linewidth = 1;
        
        startshape(dev);
+       stopFill(dev);
 
        moveto(dev, i->tag, r.xmin/20.0,r.ymin/20.0);
        lineto(dev, i->tag, r.xmax/20.0,r.ymax/20.0);
@@ -1713,6 +1719,8 @@ int swf_setparameter(gfxdevice_t*dev, const char*name, const char*value)
        i->config_bboxvars = atoi(value);
     } else if(!strcmp(name, "internallinkfunction")) {
        i->config_internallinkfunction = strdup(value);
+    } else if(!strcmp(name, "disable_polygon_conversion")) {
+       i->config_disable_polygon_conversion = atoi(value);
     } else if(!strcmp(name, "insertstop")) {
        i->config_insertstoptag = atoi(value);
     } else if(!strcmp(name, "protect")) {
@@ -2164,12 +2172,24 @@ static int gfxline_type(gfxline_t*line)
 static int gfxline_has_dots(gfxline_t*line)
 {
     int tmplines=0;
-    double x,y;
+    double x=0,y=0;
     double dist = 0;
     int isline = 0;
+    int short_gap = 0;
     while(line) {
        if(line->type == gfx_moveTo) {
-           if(isline && dist < 1) {
+           /* test the length of the preceding line, and assume it is a dot if
+              it's length is less than 1.0. But *only* if there's a noticable 
+              gap between the previous line and the next moveTo. (I've come
+              across a PDF where thousands of "dots" were stringed together,
+              forming a line) */
+           int last_short_gap = short_gap;
+           if((fabs(line->x - x) + fabs(line->y - y)) < 1.0) {
+               short_gap = 1;
+           } else {
+               short_gap = 0;
+           }
+           if(isline && dist < 1 && !short_gap && !last_short_gap) {
                return 1;
            }
            dist = 0;
@@ -2186,7 +2206,7 @@ static int gfxline_has_dots(gfxline_t*line)
        y = line->y;
        line = line->next;
     }
-    if(isline && dist < 1) {
+    if(isline && dist < 1 && !short_gap) {
        return 1;
     }
     return 0;
@@ -2265,10 +2285,11 @@ static void swf_stroke(gfxdevice_t*dev, gfxline_t*line, gfxcoord_t width, gfxcol
 
     /* TODO: * split line into segments, and perform this check for all segments */
 
-    if(!has_dots && 
-       (width <= i->config_caplinewidth 
+    if(i->config_disable_polygon_conversion ||
+       (!has_dots &&
+        (width <= i->config_caplinewidth 
         || (cap_style == gfx_capRound && joint_style == gfx_joinRound)
-        || (cap_style == gfx_capRound && type<=2))) {} else 
+        || (cap_style == gfx_capRound && type<=2)))) {} else 
     {
        /* convert line to polygon */
        msg("<trace> draw as polygon, type=%d dots=%d", type, has_dots);