X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fdevices%2Fswf.c;h=b12f27baaa06130ceee9e0070d5b428d0f906152;hb=66f6d2a40bed5716c469f0e2c8de1cc13e0022a2;hp=87e9f0255c864ff465ca936c41f5ef920e76c5c5;hpb=23da1a9feaa8378d29ebbceb9e72c981ee23f5f2;p=swftools.git

diff --git a/lib/devices/swf.c b/lib/devices/swf.c
index 87e9f02..b12f27b 100644
--- a/lib/devices/swf.c
+++ b/lib/devices/swf.c
@@ -78,6 +78,7 @@ typedef struct _swfoutput_internal
     int config_enablezlib;
     int config_insertstoptag;
     int config_flashversion;
+    int config_reordertags;
     int config_splinemaxerror;
     int config_fontsplinemaxerror;
     int config_filloverlap;
@@ -234,6 +235,7 @@ static swfoutput_internal* init_internal_struct()
     i->config_linktarget=0;
     i->config_internallinkfunction=0;
     i->config_externallinkfunction=0;
+    i->config_reordertags=1;
 
     i->config_linkcolor.r = i->config_linkcolor.g = i->config_linkcolor.b = 255;
     i->config_linkcolor.a = 0x40;
@@ -738,6 +740,18 @@ static void endtext(gfxdevice_t*dev)
 
     putcharacters(dev, i->tag);
     swf_SetU8(i->tag,0);
+
+    if(i->swf->fileVersion >= 8) {
+	i->tag = swf_InsertTag(i->tag, ST_CSMTEXTSETTINGS);
+	swf_SetU16(i->tag, i->textid);
+	//swf_SetU8(i->tag, /*subpixel grid*/(2<<3)|/*flashtype*/0x40);
+	//swf_SetU8(i->tag, /*grid*/(1<<3)|/*flashtype*/0x40);
+	//swf_SetU8(i->tag, /*grid*/(0<<3)|/*flashtype*/0x40);
+	swf_SetU8(i->tag, /*grid*/(1<<3)|/*no flashtype*/0x00);
+	swf_SetU32(i->tag, 0);//thickness
+	swf_SetU32(i->tag, 0);//sharpness
+	swf_SetU8(i->tag, 0);//reserved
+    }
     i->tag = swf_InsertTag(i->tag,ST_PLACEOBJECT2);
 
     swf_ObjectPlace(i->tag,i->textid,getNewDepth(dev),&i->page_matrix,NULL,NULL);
@@ -1219,7 +1233,8 @@ void swfoutput_finalize(gfxdevice_t*dev)
 	i->swf->compressed = 1;
     }
 
-    swf_Optimize(i->swf);
+    if(i->config_reordertags)
+	swf_Optimize(i->swf);
 }
 
 int swfresult_save(gfxresult_t*gfx, char*filename)
@@ -1742,6 +1757,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, "reordertags")) {
+	i->config_reordertags = atoi(value);
     } else if(!strcmp(name, "internallinkfunction")) {
 	i->config_internallinkfunction = strdup(value);
     } else if(!strcmp(name, "externallinkfunction")) {
@@ -1804,7 +1821,6 @@ int swf_setparameter(gfxdevice_t*dev, const char*name, const char*value)
 	    i->config_linkcolor.a);
 
     } else {
-	fprintf(stderr, "unknown parameter: %s (=%s)\n", name, value);
 	return 0;
     }
     return 1;
@@ -1886,10 +1902,10 @@ static int add_image(swfoutput_internal*i, gfximage_t*img, int targetwidth, int
     int num_colors = swf_ImageGetNumberOfPaletteEntries(mem,sizex,sizey,0);
     int has_alpha = swf_ImageHasAlpha(mem,sizex,sizey);
     
-    msg("<verbose> Drawing %dx%d %s%simage at size %dx%d (%dx%d), %s%d colors",
+    msg("<verbose> Drawing %dx%d %s%simage (id %d) at size %dx%d (%dx%d), %s%d colors",
 	    sizex, sizey, 
 	    has_alpha?(has_alpha==2?"semi-transparent ":"transparent "):"", 
-	    is_jpeg?"jpeg-":"",
+	    is_jpeg?"jpeg-":"", i->currentswfid+1,
 	    newsizex, newsizey,
 	    targetwidth, targetheight,
 	    /*newsizex, newsizey,*/