X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fdevices%2Fswf.c;h=c23783b617ad10f71cce4d4682de7d16b1138030;hb=9e546e0ca2d4472b77020cfc745f281b7864e6f9;hp=01bac6a521731bc71d42484d605aa03270f2f9c4;hpb=1b790bfd12c24ff4bd68ce4305f99d979e1cfaea;p=swftools.git

diff --git a/lib/devices/swf.c b/lib/devices/swf.c
index 01bac6a..c23783b 100644
--- a/lib/devices/swf.c
+++ b/lib/devices/swf.c
@@ -77,6 +77,7 @@ typedef struct _swfoutput_internal
     double config_ppmsubpixels;
     double config_jpegsubpixels;
     char hasbuttons;
+    int config_dots;
     int config_simpleviewer;
     int config_opennewwindow;
     int config_ignoredraworder;
@@ -246,6 +247,7 @@ static swfoutput_internal* init_internal_struct()
     i->config_drawonlyshapes=0;
     i->config_jpegquality=85;
     i->config_storeallcharacters=0;
+    i->config_dots=1;
     i->config_enablezlib=0;
     i->config_insertstoptag=0;
     i->config_flashversion=6;
@@ -311,12 +313,38 @@ typedef struct _plotxy
     double x,y;
 } plotxy_t;
 
+static inline int twipsnap(double f)
+{
+    /* if(f < -0x40000000/20.0) {
+	fprintf(stderr, "Warning: Coordinate underflow (%f)\n", f);
+	f = -0x40000000/20.0;
+    } else if(f>0x3fffffff/20.0) {
+	fprintf(stderr, "Warning: Coordinate overflow (%f)\n", f);
+	f = 0x3fffffff/20.0;
+    }*/
+
+    /* clamp coordinates to a rectangle with the property that we
+       can represent a line from the upper left corner to the upper
+       right corner using no more than 64 strokes */
+    const double min = -(1<<(18+4))/20.0;
+    const double max = ((1<<(18+4))-1)/20.0;
+    if(f < min) {
+	fprintf(stderr, "Warning: Coordinate underflow (%f)\n", f);
+	f = min;
+    } else if(f>max) {
+	fprintf(stderr, "Warning: Coordinate overflow (%f)\n", f);
+	f = max;
+    }
+
+    return (int)(f*20);
+}
+
 // write a move-to command into the swf
 static int movetoxy(gfxdevice_t*dev, TAG*tag, plotxy_t p0)
 {
     swfoutput_internal*i = (swfoutput_internal*)dev->internal;
-    int rx = (int)(p0.x*20);
-    int ry = (int)(p0.y*20);
+    int rx = twipsnap(p0.x);
+    int ry = twipsnap(p0.y);
     if(rx!=i->swflastx || ry!=i->swflasty || i->fillstylechanged) {
       swf_ShapeSetMove (tag, i->shape, rx,ry);
       i->fillstylechanged = 0;
@@ -378,18 +406,24 @@ static void addPointToBBox(gfxdevice_t*dev, int px, int py)
 static void linetoxy(gfxdevice_t*dev, TAG*tag, plotxy_t p0)
 {
     swfoutput_internal*i = (swfoutput_internal*)dev->internal;
-    int px = (int)(p0.x*20);
-    int py = (int)(p0.y*20);
+    int px = twipsnap(p0.x);
+    int py = twipsnap(p0.y);
     int rx = (px-i->swflastx);
     int ry = (py-i->swflasty);
     if(rx|ry) {
 	swf_ShapeSetLine (tag, i->shape, rx,ry);
 	addPointToBBox(dev, i->swflastx,i->swflasty);
 	addPointToBBox(dev, px,py);
-    }/* else if(!i->fill) {
+    } /* this is a nice idea, but doesn't work with current flash
+         players (the pixel will be invisible if they're not
+         precisely on a pixel boundary) 
+         Besides, we should only do this if this lineto itself
+         is again followed by a "move".
+         else if(!i->fill && i->config_dots) {
        // treat lines of length 0 as plots, making them
        // at least 1 twip wide so Flash will display them
-	plot(dev, i->swflastx, i->swflasty, tag);
+	//plot(dev, i->swflastx, i->swflasty, tag);
+	swf_ShapeSetLine (tag, i->shape, rx+1,ry);
     }*/
 
     i->shapeisempty = 0;
@@ -411,12 +445,12 @@ static void splineto(gfxdevice_t*dev, TAG*tag, plotxy_t control,plotxy_t end)
     int lastlastx = i->swflastx;
     int lastlasty = i->swflasty;
 
-    int cx = ((int)(control.x*20)-i->swflastx);
-    int cy = ((int)(control.y*20)-i->swflasty);
+    int cx = (twipsnap(control.x)-i->swflastx);
+    int cy = (twipsnap(control.y)-i->swflasty);
     i->swflastx += cx;
     i->swflasty += cy;
-    int ex = ((int)(end.x*20)-i->swflastx);
-    int ey = ((int)(end.y*20)-i->swflasty);
+    int ex = (twipsnap(end.x)-i->swflastx);
+    int ey = (twipsnap(end.y)-i->swflasty);
     i->swflastx += ex;
     i->swflasty += ey;
     
@@ -1098,6 +1132,7 @@ void gfxdevice_swf_init(gfxdevice_t* dev)
     i->swf->movieSize.ymin = 0;
     i->swf->movieSize.xmax = 0;
     i->swf->movieSize.ymax = 0;
+    i->swf->fileAttributes = 9; // as3, local-with-network
     
     i->swf->firstTag = swf_InsertTag(NULL,ST_SETBACKGROUNDCOLOR);
     i->tag = i->swf->firstTag;
@@ -1442,17 +1477,17 @@ void* swfresult_get(gfxresult_t*gfx, const char*name)
     if(!strcmp(name, "swf")) {
 	return (void*)swf_CopySWF(swf);
     } else if(!strcmp(name, "xmin")) {
-	return (void*)(swf->movieSize.xmin/20);
+	return (void*)(ptroff_t)(swf->movieSize.xmin/20);
     } else if(!strcmp(name, "ymin")) {
-	return (void*)(swf->movieSize.ymin/20);
+	return (void*)(ptroff_t)(swf->movieSize.ymin/20);
     } else if(!strcmp(name, "xmax")) {
-	return (void*)(swf->movieSize.xmax/20);
+	return (void*)(ptroff_t)(swf->movieSize.xmax/20);
     } else if(!strcmp(name, "ymax")) {
-	return (void*)(swf->movieSize.ymax/20);
+	return (void*)(ptroff_t)(swf->movieSize.ymax/20);
     } else if(!strcmp(name, "width")) {
-	return (void*)((swf->movieSize.xmax - swf->movieSize.xmin)/20);
+	return (void*)(ptroff_t)((swf->movieSize.xmax - swf->movieSize.xmin)/20);
     } else if(!strcmp(name, "height")) {
-	return (void*)((swf->movieSize.ymax - swf->movieSize.ymin)/20);
+	return (void*)(ptroff_t)((swf->movieSize.ymax - swf->movieSize.ymin)/20);
     }
     return 0;
 }
@@ -1613,6 +1648,8 @@ void swfoutput_linktourl(gfxdevice_t*dev, const char*url, gfxline_t*points)
     actions = action_End(actions);
    
     drawlink(dev, actions, 0, points, 0, url);
+
+    swf_ActionFree(actions);
 }
 void swfoutput_linktopage(gfxdevice_t*dev, int page, gfxline_t*points)
 {
@@ -1639,6 +1676,8 @@ void swfoutput_linktopage(gfxdevice_t*dev, int page, gfxline_t*points)
     sprintf(name, "page%d", page);
 
     drawlink(dev, actions, 0, points, 0, name);
+    
+    swf_ActionFree(actions);
 }
 
 /* Named Links (a.k.a. Acrobatmenu) are used to implement various gadgets
@@ -1771,6 +1810,7 @@ static void drawlink(gfxdevice_t*dev, ActionTAG*actions1, ActionTAG*actions2, gf
     i->swflastx = i->swflasty = 0;
     drawgfxline(dev, points, 1);
     swf_ShapeSetEnd(i->tag);
+    swf_ShapeFree(i->shape);
 
     /* shape2 */
     myshapeid2 = getNewID(dev);
@@ -1794,6 +1834,7 @@ static void drawlink(gfxdevice_t*dev, ActionTAG*actions1, ActionTAG*actions2, gf
     i->swflastx = i->swflasty = 0;
     drawgfxline(dev, points, 1);
     swf_ShapeSetEnd(i->tag);
+    swf_ShapeFree(i->shape);
 
     if(!mouseover)
     {
@@ -1851,9 +1892,9 @@ static void drawlink(gfxdevice_t*dev, ActionTAG*actions1, ActionTAG*actions2, gf
         m = i->page_matrix;
         m.tx = p.x;
         m.ty = p.y;
-	swf_ObjectPlace(i->tag, buttonid, getNewDepth(dev),&m,0,name);
+	swf_ObjectPlace(i->tag, buttonid, getNewDepth(dev),&m,0,(U8*)name);
     } else {
-	swf_ObjectPlace(i->tag, buttonid, getNewDepth(dev),&i->page_matrix,0,name);
+	swf_ObjectPlace(i->tag, buttonid, getNewDepth(dev),&i->page_matrix,0,(U8*)name);
     }
 }
 
@@ -1936,6 +1977,8 @@ int swf_setparameter(gfxdevice_t*dev, const char*name, const char*value)
 	i->config_enablezlib = atoi(value);
     } else if(!strcmp(name, "bboxvars")) {
 	i->config_bboxvars = atoi(value);
+    } else if(!strcmp(name, "dots")) {
+	i->config_dots = atoi(value);
     } else if(!strcmp(name, "frameresets")) {
 	i->config_frameresets = atoi(value);
     } else if(!strcmp(name, "showclipshapes")) {
@@ -2027,6 +2070,7 @@ int swf_setparameter(gfxdevice_t*dev, const char*name, const char*value)
         printf("storeallcharacters          don't reduce the fonts to used characters in the output file\n");
         printf("enablezlib                  switch on zlib compression (also done if flashversion>=7)\n");
         printf("bboxvars                    store the bounding box of the SWF file in actionscript variables\n");
+        printf("dots                        Take care to handle dots correctly\n");
         printf("reordertags=0/1             (default: 1) perform some tag optimizations\n");
         printf("internallinkfunction=<name> when the user clicks a internal link (to a different page) in the converted file, this actionscript function is called\n");
         printf("externallinkfunction=<name> when the user clicks an external link (e.g. http://www.foo.bar/) on the converted file, this actionscript function is called\n");
@@ -2483,12 +2527,14 @@ 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(i->config_disable_polygon_conversion || type>=5 ||
+    if(i->config_disable_polygon_conversion || /*type>=5 ||*/
        (!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);
 	if(has_dots)