X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fdevices%2Fswf.c;h=614b2250f47f8e4b7172d034698f789925c8e78f;hb=0d0018bb20748de8a38d5791bd08a307e2a421d9;hp=32fca541666055e98ed3568123f5185358f47b37;hpb=72ec9e32258749cb564b71336c3bb368620239ba;p=swftools.git

diff --git a/lib/devices/swf.c b/lib/devices/swf.c
index 32fca54..614b225 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;
@@ -98,6 +99,7 @@ typedef struct _swfoutput_internal
     int config_bboxvars;
     int config_disable_polygon_conversion;
     int config_normalize_polygon_positions;
+    char config_disablelinks;
     RGBA config_linkcolor;
     float config_minlinewidth;
     double config_caplinewidth;
@@ -236,6 +238,7 @@ static swfoutput_internal* init_internal_struct()
     i->firstpage = 1;
     i->pagefinished = 1;
 
+    i->config_disablelinks=0;
     i->config_dumpfonts=0;
     i->config_ppmsubpixels=0;
     i->config_jpegsubpixels=0;
@@ -244,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;
@@ -384,10 +388,16 @@ static void linetoxy(gfxdevice_t*dev, TAG*tag, plotxy_t p0)
 	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;
@@ -1096,6 +1106,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;
@@ -1440,17 +1451,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;
 }
@@ -1559,6 +1570,9 @@ void swf_drawlink(gfxdevice_t*dev, gfxline_t*points, const char*url)
 {
     swfoutput_internal*i = (swfoutput_internal*)dev->internal;
 
+    if(i->config_disablelinks)
+        return;
+
     if(!strncmp("http://pdf2swf:", url, 15)) {
 	char*tmp = strdup(url);
 	int l = strlen(tmp);
@@ -1589,6 +1603,8 @@ void swfoutput_linktourl(gfxdevice_t*dev, const char*url, gfxline_t*points)
 	endshape(dev);
     if(i->textid>=0)
 	endtext(dev);
+
+    /* TODO: escape special characters in url */
     
     if(i->config_externallinkfunction && i->config_flashversion<=8) {
 	actions = action_PushString(actions, url); //parameter
@@ -1606,6 +1622,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)
 {
@@ -1632,6 +1650,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
@@ -1764,6 +1784,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);
@@ -1787,6 +1808,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)
     {
@@ -1929,6 +1951,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")) {
@@ -1975,6 +1999,8 @@ int swf_setparameter(gfxdevice_t*dev, const char*name, const char*value)
 	i->config_dumpfonts = atoi(value);
     } else if(!strcmp(name, "animate")) {
 	i->config_animate = atoi(value);
+    } else if(!strcmp(name, "disablelinks")) {
+	i->config_disablelinks = atoi(value);
     } else if(!strcmp(name, "simpleviewer")) {
 	i->config_simpleviewer = atoi(value);
     } else if(!strcmp(name, "next_bitmap_is_jpeg")) {
@@ -2018,6 +2044,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");
@@ -2032,6 +2059,7 @@ int swf_setparameter(gfxdevice_t*dev, const char*name, const char*value)
         printf("animate                     insert a showframe tag after each placeobject (animate draw order of PDF files)\n");
         printf("jpegquality=<quality>       set compression quality of jpeg images\n");
 	printf("splinequality=<value>       Set the quality of spline convertion to value (0-100, default: 100).\n");
+	printf("disablelinks                Disable links.\n");
     } else {
 	return 0;
     }
@@ -2473,12 +2501,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)
@@ -2840,6 +2870,16 @@ static void swf_drawchar(gfxdevice_t*dev, gfxfont_t*font, int glyph, gfxcolor_t*
 	msg("<error> swf_drawchar called (glyph %d) without font", glyph);
 	return;
     }
+
+    if(i->config_drawonlyshapes) {
+        gfxglyph_t*g = &font->glyphs[glyph];
+        gfxline_t*line2 = gfxline_clone(g->line);
+        gfxline_transform(line2, matrix);
+	dev->fill(dev, line2, color);
+        gfxline_free(line2);
+        return;
+    }
+
     if(!i->swffont || !i->swffont->name || strcmp((char*)i->swffont->name,font->id)) // not equal to current font
     {
 	/* TODO: remove the need for this (enhance getcharacterbbox so that it can cope