X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fdevices%2Fswf.c;h=b23f262733d45227664c18517f6af1712547c69a;hb=5eb77fbc6bca1b830002ead615f3bea90888ff39;hp=8ba141a5fa302fcf5054580ae106083da46febf9;hpb=5b97294f0d92194820e794198456542dcf1bf3fe;p=swftools.git

diff --git a/lib/devices/swf.c b/lib/devices/swf.c
index 8ba141a..b23f262 100644
--- a/lib/devices/swf.c
+++ b/lib/devices/swf.c
@@ -79,18 +79,22 @@ typedef struct _swfoutput_internal
     int config_insertstoptag;
     int config_flashversion;
     int config_reordertags;
+    int config_showclipshapes;
     int config_splinemaxerror;
     int config_fontsplinemaxerror;
     int config_filloverlap;
     int config_protect;
     int config_bboxvars;
     int config_disable_polygon_conversion;
+    int config_normalize_polygon_positions;
     RGBA config_linkcolor;
     float config_minlinewidth;
     double config_caplinewidth;
     char* config_linktarget;
     char*config_internallinkfunction;
     char*config_externallinkfunction;
+    char config_animate;
+    double config_framerate;
 
     SWF* swf;
 
@@ -149,8 +153,9 @@ typedef struct _swfoutput_internal
 
     char overflow;
 
+    int current_font_size;
     MATRIX fontmatrix;
-    double fontm11,fontm12,fontm21,fontm22;
+    double lastfontm11,lastfontm12,lastfontm21,lastfontm22;
     SWFFONT *swffont;
     RGBA strokergb;
     RGBA fillrgb;
@@ -174,7 +179,7 @@ static void swf_fillbitmap(gfxdevice_t*dev, gfxline_t*line, gfximage_t*img, gfxm
 static void swf_fillgradient(gfxdevice_t*dev, gfxline_t*line, gfxgradient_t*gradient, gfxgradienttype_t type, gfxmatrix_t*matrix);
 static void swf_drawchar(gfxdevice_t*dev, gfxfont_t*font, int glyph, gfxcolor_t*color, gfxmatrix_t*matrix);
 static void swf_addfont(gfxdevice_t*dev, gfxfont_t*font);
-static void swf_drawlink(gfxdevice_t*dev, gfxline_t*line, char*action);
+static void swf_drawlink(gfxdevice_t*dev, gfxline_t*line, const char*action);
 static void swf_startframe(gfxdevice_t*dev, int width, int height);
 static void swf_endframe(gfxdevice_t*dev);
 static gfxresult_t* swf_finish(gfxdevice_t*driver);
@@ -225,11 +230,13 @@ static swfoutput_internal* init_internal_struct()
     i->config_generate_fake_tags=0;
     i->config_insertstoptag=0;
     i->config_flashversion=6;
+    i->config_framerate=0.25;
     i->config_splinemaxerror=1;
     i->config_fontsplinemaxerror=1;
     i->config_filloverlap=0;
     i->config_protect=0;
     i->config_bboxvars=0;
+    i->config_showclipshapes=0;
     i->config_minlinewidth=0.05;
     i->config_caplinewidth=1;
     i->config_linktarget=0;
@@ -675,10 +682,10 @@ static void putcharacter(gfxdevice_t*dev, int fontid, int charid, int x,int y, i
 /* Notice: we can only put chars in the range -1639,1638 (-32768/20,32768/20).
    So if we set this value to high, the char coordinates will overflow.
    If we set it to low, however, the char positions will be inaccurate */
-#define FONT_INTERNAL_SIZE 4
+#define GLYPH_SCALE 1
 
 /* process a character. */
-static int drawchar(gfxdevice_t*dev, SWFFONT *swffont, int charid, swfmatrix_t*m, gfxcolor_t*col)
+static int drawchar(gfxdevice_t*dev, SWFFONT *swffont, int charid, float x, float y, gfxcolor_t*col)
 {
     swfoutput_internal*i = (swfoutput_internal*)dev->internal;
     if(!swffont) {
@@ -701,21 +708,21 @@ static int drawchar(gfxdevice_t*dev, SWFFONT *swffont, int charid, swfmatrix_t*m
     if(i->textid<0)
 	starttext(dev);
 
-    float x = m->m31;
-    float y = m->m32;
-    float det = ((m->m11*m->m22)-(m->m21*m->m12));
+    double det = i->fontmatrix.sx/65536.0 * i->fontmatrix.sy/65536.0 - 
+	         i->fontmatrix.r0/65536.0 * i->fontmatrix.r1/65536.0;
+
     if(fabs(det) < 0.0005) { 
 	/* x direction equals y direction- the text is invisible */
 	return 1;
     }
-    det = 20*FONT_INTERNAL_SIZE / det;
+    det = 20 * GLYPH_SCALE / det;
 
     SPOINT p;
-    p.x = (SCOORD)((  x * m->m22 - y * m->m12)*det);
-    p.y = (SCOORD)((- x * m->m21 + y * m->m11)*det);
+    p.x = (SCOORD)((  x * i->fontmatrix.sy/65536.0 - y * i->fontmatrix.r1/65536.0)*det);
+    p.y = (SCOORD)((- x * i->fontmatrix.r0/65536.0 + y * i->fontmatrix.sx/65536.0)*det);
 
     RGBA rgba = *(RGBA*)col;
-    putcharacter(dev, swffont->id, charid,p.x,p.y,FONT_INTERNAL_SIZE, rgba);
+    putcharacter(dev, swffont->id, charid,p.x,p.y,i->current_font_size, rgba);
     swf_FontUseGlyph(swffont, charid);
     return 1;
 }
@@ -726,7 +733,7 @@ static void endtext(gfxdevice_t*dev)
     if(i->textid<0)
         return;
 
-    i->tag = swf_InsertTag(i->tag,ST_DEFINETEXT);
+    i->tag = swf_InsertTag(i->tag,ST_DEFINETEXT2);
     swf_SetU16(i->tag, i->textid);
 
     SRECT r;
@@ -744,44 +751,52 @@ static void endtext(gfxdevice_t*dev)
     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_SetU8(i->tag, /*grid*/(1<<3)|/*flashtype*/0x40);
+	//swf_SetU8(i->tag, /*no grid*/(0<<3)|/*flashtype*/0x40);
+
 	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);
     i->textid = -1;
 }
 
 /* set's the matrix which is to be applied to characters drawn by swfoutput_drawchar() */
-static void swfoutput_setfontmatrix(gfxdevice_t*dev,double m11,double m21,
-                                                  double m12,double m22)
+static void setfontscale(gfxdevice_t*dev,double m11,double m12, double m21,double m22)
 {
     m11 *= 1024;
     m12 *= 1024;
     m21 *= 1024;
     m22 *= 1024;
     swfoutput_internal*i = (swfoutput_internal*)dev->internal;
-    if(i->fontm11 == m11 &&
-       i->fontm12 == m12 &&
-       i->fontm21 == m21 &&
-       i->fontm22 == m22)
+    if(i->lastfontm11 == m11 &&
+       i->lastfontm12 == m12 &&
+       i->lastfontm21 == m21 &&
+       i->lastfontm22 == m22)
         return;
    if(i->textid>=0)
 	endtext(dev);
-    i->fontm11 = m11;
-    i->fontm12 = m12;
-    i->fontm21 = m21;
-    i->fontm22 = m22;
     
+    i->lastfontm11 = m11;
+    i->lastfontm12 = m12;
+    i->lastfontm21 = m21;
+    i->lastfontm22 = m22;
+
+    double xsize = sqrt(m11*m11 + m12*m12);
+    double ysize = sqrt(m21*m21 + m22*m22);
+    i->current_font_size = (xsize>ysize?xsize:ysize)*1;
+    if(i->current_font_size < 1)
+	i->current_font_size = 1;
+    double ifs = 1.0 / (i->current_font_size*GLYPH_SCALE);
+
     MATRIX m;
-    m.sx = (U32)(((i->fontm11)*65536)/FONT_INTERNAL_SIZE); m.r1 = (U32)(((i->fontm12)*65536)/FONT_INTERNAL_SIZE);
-    m.r0 = (U32)(((i->fontm21)*65536)/FONT_INTERNAL_SIZE); m.sy = (U32)(((i->fontm22)*65536)/FONT_INTERNAL_SIZE); 
+    m.sx = (U32)((m11*ifs)*65536); m.r1 = (U32)((m21*ifs)*65536);
+    m.r0 = (U32)((m12*ifs)*65536); m.sy = (U32)((m22*ifs)*65536); 
     m.tx = 0;
     m.ty = 0;
     i->fontmatrix = m;
@@ -923,7 +938,7 @@ void gfxdevice_swf_init(gfxdevice_t* dev)
    
     i->swf = (SWF*)rfx_calloc(sizeof(SWF));
     i->swf->fileVersion    = i->config_flashversion;
-    i->swf->frameRate      = 0x0040; // 1 frame per 4 seconds
+    i->swf->frameRate      = i->config_framerate*0x100;
     i->swf->movieSize.xmin = 0;
     i->swf->movieSize.ymin = 0;
     i->swf->movieSize.xmax = 0;
@@ -947,9 +962,8 @@ static void startshape(gfxdevice_t*dev)
 
     if(i->shapeid>=0)
 	return;
-
-    if(i->textid>=0)
-        endtext(dev);
+    //if(i->chardatapos && i->chardata[i->chardatapos-1].color.a)
+    endtext(dev);
 
     i->tag = swf_InsertTag(i->tag,ST_DEFINESHAPE3);
 
@@ -1131,6 +1145,10 @@ static void endshape(gfxdevice_t*dev)
     m.ty += i->shapeposy;
     swf_ObjectPlace(i->tag,i->shapeid,getNewDepth(dev),&m,NULL,NULL);
 
+    if(i->config_animate) {
+	i->tag = swf_InsertTag(i->tag,ST_SHOWFRAME);
+    }
+
     swf_ShapeFree(i->shape);
     i->shape = 0;
     i->shapeid = -1;
@@ -1233,11 +1251,11 @@ void swfoutput_finalize(gfxdevice_t*dev)
 	i->swf->compressed = 1;
     }
 
-    if(i->config_reordertags)
-	swf_Optimize(i->swf);
+//    if(i->config_reordertags)
+//	swf_Optimize(i->swf);
 }
 
-int swfresult_save(gfxresult_t*gfx, char*filename)
+int swfresult_save(gfxresult_t*gfx, const char*filename)
 {
     SWF*swf = (SWF*)gfx->internal;
     int fi;
@@ -1263,7 +1281,7 @@ int swfresult_save(gfxresult_t*gfx, char*filename)
      close(fi);
     return 0;
 }
-void* swfresult_get(gfxresult_t*gfx, char*name)
+void* swfresult_get(gfxresult_t*gfx, const char*name)
 {
     SWF*swf = (SWF*)gfx->internal;
     if(!strcmp(name, "swf")) {
@@ -1392,15 +1410,15 @@ static void swfoutput_setlinewidth(gfxdevice_t*dev, double _linewidth)
 static void drawlink(gfxdevice_t*dev, ActionTAG*,ActionTAG*, gfxline_t*points, char mouseover);
 static void swfoutput_namedlink(gfxdevice_t*dev, char*name, gfxline_t*points);
 static void swfoutput_linktopage(gfxdevice_t*dev, int page, gfxline_t*points);
-static void swfoutput_linktourl(gfxdevice_t*dev, char*url, gfxline_t*points);
+static void swfoutput_linktourl(gfxdevice_t*dev, const char*url, gfxline_t*points);
 
-void swfoutput_drawlink(gfxdevice_t*dev, char*url, gfxline_t*points)
+/*void swfoutput_drawlink(gfxdevice_t*dev, char*url, gfxline_t*points)
 {
     swfoutput_internal*i = (swfoutput_internal*)dev->internal;
     dev->drawlink(dev, points, url);
-}
+}*/
 
-void swf_drawlink(gfxdevice_t*dev, gfxline_t*points, char*url)
+void swf_drawlink(gfxdevice_t*dev, gfxline_t*points, const char*url)
 {
     swfoutput_internal*i = (swfoutput_internal*)dev->internal;
 
@@ -1426,7 +1444,7 @@ void swf_drawlink(gfxdevice_t*dev, gfxline_t*points, char*url)
 	swfoutput_linktourl(dev, url, points);
     }
 }
-void swfoutput_linktourl(gfxdevice_t*dev, char*url, gfxline_t*points)
+void swfoutput_linktourl(gfxdevice_t*dev, const char*url, gfxline_t*points)
 {
     ActionTAG* actions = 0;
     swfoutput_internal*i = (swfoutput_internal*)dev->internal;
@@ -1758,14 +1776,21 @@ 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, "showclipshapes")) {
+	i->config_showclipshapes = 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")) {
 	i->config_externallinkfunction = strdup(value);
+    } else if(!strcmp(name, "linkfunction")) { //sets both internallinkfunction and externallinkfunction
+	i->config_internallinkfunction = strdup(value);
+	i->config_externallinkfunction = strdup(value);
     } else if(!strcmp(name, "disable_polygon_conversion")) {
 	i->config_disable_polygon_conversion = atoi(value);
+    } else if(!strcmp(name, "normalize_polygon_positions")) {
+	i->config_normalize_polygon_positions = atoi(value);
     } else if(!strcmp(name, "insertstop")) {
 	i->config_insertstoptag = atoi(value);
     } else if(!strcmp(name, "protect")) {
@@ -1780,6 +1805,11 @@ int swf_setparameter(gfxdevice_t*dev, const char*name, const char*value)
 	if(i->swf) {
 	    i->swf->fileVersion = i->config_flashversion;
 	}
+    } else if(!strcmp(name, "framerate")) {
+	i->config_framerate = atoi(value);
+	if(i->swf) {
+	    i->swf->frameRate = i->config_framerate*0x100;
+	}
     } else if(!strcmp(name, "minlinewidth")) {
 	i->config_minlinewidth = atof(value);
     } else if(!strcmp(name, "caplinewidth")) {
@@ -1788,12 +1818,14 @@ int swf_setparameter(gfxdevice_t*dev, const char*name, const char*value)
 	i->config_linktarget = strdup(value);
     } else if(!strcmp(name, "dumpfonts")) {
 	i->config_dumpfonts = atoi(value);
+    } else if(!strcmp(name, "animate")) {
+	i->config_animate = atoi(value);
     } else if(!strcmp(name, "next_bitmap_is_jpeg")) {
 	i->jpeg = 1;
     } else if(!strcmp(name, "jpegquality")) {
 	int val = atoi(value);
 	if(val<0) val=0;
-	if(val>100) val=100;
+	if(val>101) val=101;
 	i->config_jpegquality = val;
     } else if(!strcmp(name, "splinequality")) {
 	int v = atoi(value);
@@ -2016,6 +2048,34 @@ static void swf_fillbitmap(gfxdevice_t*dev, gfxline_t*line, gfximage_t*img, gfxm
     swf_ObjectPlace(i->tag,myshapeid,getNewDepth(dev),&i->page_matrix,&cxform2,NULL);
 }
 
+static RGBA col_black = {255,0,0,0};
+
+static void drawoutline(gfxdevice_t*dev, gfxline_t*line)
+{
+    swfoutput_internal*i = (swfoutput_internal*)dev->internal;
+
+    int myshapeid = getNewID(dev);
+    i->tag = swf_InsertTag(i->tag,ST_DEFINESHAPE3);
+
+    SHAPE*shape;
+    swf_ShapeNew(&shape);
+    int lsid = swf_ShapeAddLineStyle(shape,1,&col_black);
+
+    swf_SetU16(i->tag,myshapeid);
+    SRECT r = gfxline_getSWFbbox(line);
+    swf_SetRect(i->tag,&r);
+    swf_SetShapeStyles(i->tag,shape);
+    swf_ShapeCountBits(shape,NULL,NULL);
+    swf_SetShapeBits(i->tag,shape);
+    swf_ShapeSetAll(i->tag,shape,UNDEFINED_COORD,UNDEFINED_COORD,lsid,0,0);
+    drawgfxline(dev, line);
+    swf_ShapeSetEnd(i->tag);
+    swf_ShapeFree(shape);
+	
+    i->tag = swf_InsertTag(i->tag,ST_PLACEOBJECT2);
+    swf_ObjectPlace(i->tag, myshapeid, getNewDepth(dev), 0,0,0);
+}
+
 static void swf_startclip(gfxdevice_t*dev, gfxline_t*line)
 {
     swfoutput_internal*i = (swfoutput_internal*)dev->internal;
@@ -2029,6 +2089,9 @@ static void swf_startclip(gfxdevice_t*dev, gfxline_t*line)
         i->clippos --;
     } 
 
+    if(i->config_showclipshapes)
+	drawoutline(dev, line);
+
     int myshapeid = getNewID(dev);
     i->tag = swf_InsertTag(i->tag,ST_DEFINESHAPE3);
     RGBA col;
@@ -2049,7 +2112,16 @@ static void swf_startclip(gfxdevice_t*dev, gfxline_t*line)
     swf_SetShapeBits(i->tag,shape);
     swf_ShapeSetAll(i->tag,shape,UNDEFINED_COORD,UNDEFINED_COORD,0,fsid,0);
     i->swflastx = i->swflasty = UNDEFINED_COORD;
+    i->shapeisempty = 1;
     drawgfxline(dev, line);
+    if(i->shapeisempty) {
+	/* an empty clip shape is equivalent to a shape with no area */
+	int x = line?line->x:0;
+	int y = line?line->y:0;
+	moveto(dev, i->tag, x,y);
+	lineto(dev, i->tag, x,y);
+	lineto(dev, i->tag, x,y);
+    }
     swf_ShapeSetEnd(i->tag);
     swf_ShapeFree(shape);
 
@@ -2236,17 +2308,17 @@ static void swf_stroke(gfxdevice_t*dev, gfxline_t*line, gfxcoord_t width, gfxcol
     msg("<trace> draw as stroke, type=%d dots=%d", type, has_dots);
     endtext(dev);
 
-#ifdef NORMALIZE_POLYGON_POSITIONS
-    endshape(dev);
-    double startx = 0, starty = 0;
-    if(line && line->type == gfx_moveTo) {
-	startx = line->x;
-	starty = line->y;
-    }
-    line = gfxline_move(line, -startx, -starty);
-    i->shapeposx = (int)(startx*20);
-    i->shapeposy = (int)(starty*20);
-#endif
+    if(i->config_normalize_polygon_positions) {
+	endshape(dev);
+	double startx = 0, starty = 0;
+	if(line && line->type == gfx_moveTo) {
+	    startx = line->x;
+	    starty = line->y;
+	}
+	line = gfxline_move(line, -startx, -starty);
+	i->shapeposx = (int)(startx*20);
+	i->shapeposy = (int)(starty*20);
+    }
 
     swfoutput_setstrokecolor(dev, color->r, color->g, color->b, color->a);
     swfoutput_setlinewidth(dev, width);
@@ -2254,9 +2326,9 @@ static void swf_stroke(gfxdevice_t*dev, gfxline_t*line, gfxcoord_t width, gfxcol
     stopFill(dev);
     drawgfxline(dev, line);
 
-#ifdef NORMALIZE_POLYGON_POSITIONS
-    free(line); //account for _move
-#endif
+    if(i->config_normalize_polygon_positions) {
+	free(line); //account for _move
+    }
 
 }
 static void swf_fill(gfxdevice_t*dev, gfxline_t*line, gfxcolor_t*color)
@@ -2269,21 +2341,23 @@ static void swf_fill(gfxdevice_t*dev, gfxline_t*line, gfxcolor_t*color)
     gfxbbox_t r = gfxline_getbbox(line);
     int is_outside_page = !is_inside_page(dev, r.xmin, r.ymin) || !is_inside_page(dev, r.xmax, r.ymax);
 
+    //if(i->chardatapos && i->chardata[i->chardatapos-1].color.a) {
     endtext(dev);
+
     if(!i->config_ignoredraworder)
 	endshape(dev);
 
-#ifdef NORMALIZE_POLYGON_POSITIONS
-    endshape(dev);
-    double startx = 0, starty = 0;
-    if(line && line->type == gfx_moveTo) {
-	startx = line->x;
-	starty = line->y;
-    }
-    line = gfxline_move(line, -startx, -starty);
-    i->shapeposx = (int)(startx*20);
-    i->shapeposy = (int)(starty*20);
-#endif
+    if(i->config_normalize_polygon_positions) {
+	endshape(dev);
+	double startx = 0, starty = 0;
+	if(line && line->type == gfx_moveTo) {
+	    startx = line->x;
+	    starty = line->y;
+	}
+	line = gfxline_move(line, -startx, -starty);
+	i->shapeposx = (int)(startx*20);
+	i->shapeposy = (int)(starty*20);
+    }
 
     swfoutput_setfillcolor(dev, color->r, color->g, color->b, color->a);
     startshape(dev);
@@ -2292,9 +2366,9 @@ static void swf_fill(gfxdevice_t*dev, gfxline_t*line, gfxcolor_t*color)
     drawgfxline(dev, line);
     msg("<trace> end of swf_fill (shapeid=%d)", i->shapeid);
 
-#ifdef NORMALIZE_POLYGON_POSITIONS
-    free(line); //account for _move
-#endif
+    if(i->config_normalize_polygon_positions) {
+	free(line); //account for _move
+    }
 }
 static void swf_fillgradient(gfxdevice_t*dev, gfxline_t*line, gfxgradient_t*gradient, gfxgradienttype_t type, gfxmatrix_t*matrix)
 {
@@ -2303,7 +2377,7 @@ static void swf_fillgradient(gfxdevice_t*dev, gfxline_t*line, gfxgradient_t*grad
     msg("<error> Gradient filling not implemented yet");
 }
 
-static SWFFONT* gfxfont_to_swffont(gfxfont_t*font, char* id)
+static SWFFONT* gfxfont_to_swffont(gfxfont_t*font, const char* id)
 {
     SWFFONT*swffont = (SWFFONT*)rfx_calloc(sizeof(SWFFONT));
     int t;
@@ -2331,6 +2405,13 @@ static SWFFONT* gfxfont_to_swffont(gfxfont_t*font, char* id)
 	gfxline_t*line;
 	int advance = 0;
 	swffont->glyph2ascii[t] = font->glyphs[t].unicode;
+	if(swffont->glyph2ascii[t] == 0xffff || swffont->glyph2ascii[t] == 0x0000) {
+	    /* flash 8 flashtype requires unique unicode IDs for each character.
+	       We use the Unicode private user area to assign characters, hoping that
+	       the font doesn't contain more than 2048 glyphs */
+	    swffont->glyph2ascii[t] = 0xe000 + (t&0x1fff);
+	}
+
 	if(font->glyphs[t].name) {
 	    swffont->glyphnames[t] = strdup(font->glyphs[t].name);
 	} else {
@@ -2342,8 +2423,8 @@ static SWFFONT* gfxfont_to_swffont(gfxfont_t*font, char* id)
 	line = font->glyphs[t].line;
 	while(line) {
 	    FPOINT c,to;
-	    c.x = line->sx; c.y = line->sy;
-	    to.x = line->x; to.y = line->y;
+	    c.x = line->sx * GLYPH_SCALE; c.y = line->sy * GLYPH_SCALE;
+	    to.x = line->x * GLYPH_SCALE; to.y = line->y * GLYPH_SCALE;
 	    if(line->type == gfx_moveTo) {
 		draw.moveTo(&draw, &to);
 	    } else if(line->type == gfx_lineTo) {
@@ -2437,7 +2518,7 @@ static void swf_addfont(gfxdevice_t*dev, gfxfont_t*font)
     }
 }
 
-static void swf_switchfont(gfxdevice_t*dev, char*fontid)
+static void swf_switchfont(gfxdevice_t*dev, const char*fontid)
 {
     swfoutput_internal*i = (swfoutput_internal*)dev->internal;
 
@@ -2459,6 +2540,8 @@ static void swf_switchfont(gfxdevice_t*dev, char*fontid)
 static void swf_drawchar(gfxdevice_t*dev, gfxfont_t*font, int glyph, gfxcolor_t*color, gfxmatrix_t*matrix)
 {
     swfoutput_internal*i = (swfoutput_internal*)dev->internal;
+    if(!font)
+	return;
 	
     if(!i->swffont || !i->swffont->name || strcmp((char*)i->swffont->name,font->id)) // not equal to current font
     {
@@ -2468,16 +2551,8 @@ static void swf_drawchar(gfxdevice_t*dev, gfxfont_t*font, int glyph, gfxcolor_t*
 
 	swf_switchfont(dev, font->id); // set the current font
     }
-    swfoutput_setfontmatrix(dev, matrix->m00, matrix->m01, matrix->m10, matrix->m11);
-   
-    swfmatrix_t m;
-    m.m11 = i->fontm11;
-    m.m12 = i->fontm12;
-    m.m21 = i->fontm21;
-    m.m22 = i->fontm22;
-    m.m31 = matrix->tx;
-    m.m32 = matrix->ty;
-  
+    setfontscale(dev, matrix->m00, matrix->m01, matrix->m10, matrix->m11);
+
 /*    printf("%f %f\n", m.m31,  m.m32);
     {
     static int xpos = 40;
@@ -2488,5 +2563,5 @@ static void swf_drawchar(gfxdevice_t*dev, gfxfont_t*font, int glyph, gfxcolor_t*
     }*/
 
 
-    drawchar(dev, i->swffont, glyph, &m, color);
+    drawchar(dev, i->swffont, glyph, matrix->tx, matrix->ty, color);
 }