X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fdevices%2Fswf.c;h=99a224060cd081ac318b9071d6f71346dc662761;hb=33cec2f65eef6a6052e0b76fa3b66b4ef9216e6a;hp=a544f7eade8b0433e287db084aa03c5b95e85fb5;hpb=8c4213f182478b88c8f830a16c1910d9c5a88e53;p=swftools.git

diff --git a/lib/devices/swf.c b/lib/devices/swf.c
index a544f7e..99a2240 100644
--- a/lib/devices/swf.c
+++ b/lib/devices/swf.c
@@ -35,6 +35,7 @@
 #include "../gfxdevice.h"
 #include "../gfxtools.h"
 #include "../art/libart.h"
+#include "artsutils.c"
 
 #define CHARDATAMAX 8192
 #define CHARMIDX 0
@@ -88,6 +89,7 @@ typedef struct _swfoutput_internal
     double config_caplinewidth;
     char* config_linktarget;
     char*config_internallinkfunction;
+    char*config_externallinkfunction;
 
     SWF* swf;
 
@@ -169,8 +171,8 @@ static void swf_stroke(gfxdevice_t*dev, gfxline_t*line, gfxcoord_t width, gfxcol
 static void swf_fill(gfxdevice_t*dev, gfxline_t*line, gfxcolor_t*color);
 static void swf_fillbitmap(gfxdevice_t*dev, gfxline_t*line, gfximage_t*img, gfxmatrix_t*matrix, gfxcxform_t*cxform);
 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, char*fontid, int glyph, gfxcolor_t*color, gfxmatrix_t*matrix);
-static void swf_addfont(gfxdevice_t*dev, char*fontid, gfxfont_t*font);
+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_startframe(gfxdevice_t*dev, int width, int height);
 static void swf_endframe(gfxdevice_t*dev);
@@ -231,6 +233,7 @@ static swfoutput_internal* init_internal_struct()
     i->config_caplinewidth=1;
     i->config_linktarget=0;
     i->config_internallinkfunction=0;
+    i->config_externallinkfunction=0;
 
     i->config_linkcolor.r = i->config_linkcolor.g = i->config_linkcolor.b = 255;
     i->config_linkcolor.a = 0x40;
@@ -384,15 +387,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;
 }
 
@@ -414,7 +420,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;
@@ -424,7 +430,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;
@@ -955,9 +961,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;
 }
 
@@ -1040,6 +1047,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);
@@ -1173,12 +1181,15 @@ void swfoutput_finalize(gfxdevice_t*dev)
     while(iterator) {
 	TAG*mtag = i->swf->firstTag;
 	if(iterator->swffont) {
-	    mtag = swf_InsertTag(mtag, ST_DEFINEFONT2);
 	    if(!i->config_storeallcharacters) {
 		msg("<debug> Reducing font %s", iterator->swffont->name);
 		swf_FontReduce(iterator->swffont);
 	    }
-	    swf_FontSetDefine2(mtag, iterator->swffont);
+	    int used = iterator->swffont->use && iterator->swffont->use->used_glyphs;
+	    if(i->config_storeallcharacters || used) {
+		mtag = swf_InsertTag(mtag, ST_DEFINEFONT2);
+		swf_FontSetDefine2(mtag, iterator->swffont);
+	    }
 	}
 
         iterator = iterator->next;
@@ -1383,7 +1394,7 @@ void swf_drawlink(gfxdevice_t*dev, gfxline_t*points, char*url)
 	    if(url[t]<'0' || url[t]>'9')
 		nodigit = 1;
 	if(!nodigit) {
-	    int page = atoi(&url[4]) - 1;
+	    int page = atoi(&url[4]);
 	    if(page<0) page = 0;
 	    swfoutput_linktopage(dev, page, points);
 	}
@@ -1393,20 +1404,25 @@ void swf_drawlink(gfxdevice_t*dev, gfxline_t*points, char*url)
 }
 void swfoutput_linktourl(gfxdevice_t*dev, char*url, gfxline_t*points)
 {
-    ActionTAG* actions;
+    ActionTAG* actions = 0;
     swfoutput_internal*i = (swfoutput_internal*)dev->internal;
     if(i->shapeid>=0)
 	endshape(dev);
     if(i->textid>=0)
 	endtext(dev);
-   
-    if(!i->config_linktarget) {
+    
+    if(i->config_externallinkfunction) {
+	actions = action_PushString(actions, url); //parameter
+	actions = action_PushInt(actions, 1); //number of parameters (1)
+	actions = action_PushString(actions, i->config_externallinkfunction); //function name
+	actions = action_CallFunction(actions);
+    } else if(!i->config_linktarget) {
 	if(!i->config_opennewwindow)
-	  actions = action_GetUrl(0, url, "_parent");
+	  actions = action_GetUrl(actions, url, "_parent");
 	else
-	  actions = action_GetUrl(0, url, "_this");
+	  actions = action_GetUrl(actions, url, "_this");
     } else {
-	actions = action_GetUrl(0, url, i->config_linktarget);
+	actions = action_GetUrl(actions, url, i->config_linktarget);
     }
     actions = action_End(actions);
     
@@ -1423,13 +1439,14 @@ void swfoutput_linktopage(gfxdevice_t*dev, int page, gfxline_t*points)
 	endtext(dev);
   
     if(!i->config_internallinkfunction) {
-	actions = action_GotoFrame(actions, page);
+	actions = action_GotoFrame(actions, page-1);
 	actions = action_End(actions);
     } else {
 	actions = action_PushInt(actions, page); //parameter
 	actions = action_PushInt(actions, 1); //number of parameters (1)
 	actions = action_PushString(actions, i->config_internallinkfunction); //function name
 	actions = action_CallFunction(actions);
+	actions = action_End(actions);
     }
 
     drawlink(dev, actions, 0, points,0);
@@ -1457,12 +1474,14 @@ void swfoutput_namedlink(gfxdevice_t*dev, char*name, gfxline_t*points)
 	    actions1 = action_PushInt(0, 0); //number of parameters (0)
 	    actions1 = action_PushString(actions1, &tmp[5]); //function name
 	    actions1 = action_CallFunction(actions1);
+	    actions1 = action_End(actions1);
 	} else {
 	    *x = 0;
 	    actions1 = action_PushString(0, x+1); //parameter
 	    actions1 = action_PushInt(actions1, 1); //number of parameters (1)
 	    actions1 = action_PushString(actions1, &tmp[5]); //function name
 	    actions1 = action_CallFunction(actions1);
+	    actions1 = action_End(actions1);
 	}
 	actions2 = action_End(0);
 	mouseover = 0;
@@ -1492,24 +1511,23 @@ static void drawgfxline(gfxdevice_t*dev, gfxline_t*line)
     swfoutput_internal*i = (swfoutput_internal*)dev->internal;
     gfxcoord_t lastx=0,lasty=0,px=0,py=0;
     char lastwasmoveto;
+    int lines= 0, splines=0;
     while(1) {
 	if(!line)
 	    break;
 	/* check whether the next segment is zero */
 	if(line->type == gfx_moveTo) {
-	    msg("<trace> ======== moveTo %.2f %.2f", line->x, line->y);
 	    moveto(dev, i->tag, line->x, line->y);
 	    px = lastx = line->x;
 	    py = lasty = line->y;
 	    lastwasmoveto = 1;
 	} if(line->type == gfx_lineTo) {
-	    msg("<trace> ======== lineTo %.2f %.2f", line->x, line->y);
 	    lineto(dev, i->tag, line->x, line->y);
 	    px = line->x;
 	    py = line->y;
 	    lastwasmoveto = 0;
+	    lines++;
 	} else if(line->type == gfx_splineTo) {
-	    msg("<trace> ======== splineTo  %.2f %.2f", line->x, line->y);
 	    plotxy_t s,p;
 	    s.x = line->sx;p.x = line->x;
 	    s.y = line->sy;p.y = line->y;
@@ -1517,9 +1535,11 @@ static void drawgfxline(gfxdevice_t*dev, gfxline_t*line)
 	    px = line->x;
 	    py = line->y;
 	    lastwasmoveto = 0;
+	    splines++;
 	}
 	line = line->next;
     }
+    msg("<trace> drawgfxline, %d lines, %d splines", lines, splines);
 }
 
 
@@ -1681,6 +1701,7 @@ int swf_setparameter(gfxdevice_t*dev, const char*name, const char*value)
 {
     swfoutput_internal*i = (swfoutput_internal*)dev->internal;
 
+    msg("<trace> swfdevice: %s=%s", name, value);
     if(!strcmp(name, "jpegsubpixels")) {
 	i->config_jpegsubpixels = atof(value);
     } else if(!strcmp(name, "ppmsubpixels")) {
@@ -1714,6 +1735,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, "externallinkfunction")) {
+	i->config_externallinkfunction = strdup(value);
     } else if(!strcmp(name, "disable_polygon_conversion")) {
 	i->config_disable_polygon_conversion = atoi(value);
     } else if(!strcmp(name, "insertstop")) {
@@ -1803,129 +1826,6 @@ static CXFORM gfxcxform_to_cxform(gfxcxform_t* c)
     return cx;
 }
 
-static ArtVpath* gfxline_to_ArtVpath(gfxline_t*line)
-{
-    ArtVpath *vec = NULL;
-    int pos=0,len=0;
-    gfxline_t*l2;
-    double x=0,y=0;
-
-    /* factor which determines into how many line fragments a spline is converted */
-    double subfraction = 2.4;//0.3
-
-    l2 = line;
-    while(l2) {
-	if(l2->type == gfx_moveTo) {
-	    pos ++;
-	} if(l2->type == gfx_lineTo) {
-	    pos ++;
-	} if(l2->type == gfx_splineTo) {
-            int parts = (int)(sqrt(fabs(l2->x-2*l2->sx+x) + fabs(l2->y-2*l2->sy+y))*subfraction);
-            if(!parts) parts = 1;
-            pos += parts + 1;
-	}
-	x = l2->x;
-	y = l2->y;
-	l2 = l2->next;
-    }
-    pos++;
-    len = pos;
-
-    vec = art_new (ArtVpath, len);
-
-    pos = 0;
-    l2 = line;
-    while(l2) {
-	if(l2->type == gfx_moveTo) {
-	    vec[pos].code = ART_MOVETO;
-	    vec[pos].x = l2->x;
-	    vec[pos].y = l2->y;
-	    pos++; 
-	    assert(pos<=len);
-	} else if(l2->type == gfx_lineTo) {
-	    vec[pos].code = ART_LINETO;
-	    vec[pos].x = l2->x;
-	    vec[pos].y = l2->y;
-	    pos++; 
-	    assert(pos<=len);
-	} else if(l2->type == gfx_splineTo) {
-	    int i;
-            int parts = (int)(sqrt(fabs(l2->x-2*l2->sx+x) + fabs(l2->y-2*l2->sy+y))*subfraction);
-            if(!parts) parts = 1;
-	    for(i=0;i<=parts;i++) {
-		double t = (double)i/(double)parts;
-		vec[pos].code = ART_LINETO;
-		vec[pos].x = l2->x*t*t + 2*l2->sx*t*(1-t) + x*(1-t)*(1-t);
-		vec[pos].y = l2->y*t*t + 2*l2->sy*t*(1-t) + y*(1-t)*(1-t);
-		pos++;
-		assert(pos<=len);
-	    }
-	}
-	x = l2->x;
-	y = l2->y;
-	l2 = l2->next;
-    }
-    vec[pos].code = ART_END;
-
-    return vec;
-}
-
-static ArtSVP* gfxfillToSVP(gfxline_t*line)
-{
-    ArtVpath* vec = gfxline_to_ArtVpath(line);
-    ArtSVP *svp = art_svp_from_vpath(vec);
-    free(vec);
-    return svp;
-}
-
-static ArtSVP* gfxstrokeToSVP(gfxline_t*line, gfxcoord_t width, gfx_capType cap_style, gfx_joinType joint_style, double miterLimit)
-{
-    ArtVpath* vec = gfxline_to_ArtVpath(line);
-    ArtSVP *svp = art_svp_vpath_stroke (vec,
-			(joint_style==gfx_joinMiter)?ART_PATH_STROKE_JOIN_MITER:
-			((joint_style==gfx_joinRound)?ART_PATH_STROKE_JOIN_ROUND:
-			 ((joint_style==gfx_joinBevel)?ART_PATH_STROKE_JOIN_BEVEL:ART_PATH_STROKE_JOIN_BEVEL)),
-			(cap_style==gfx_capButt)?ART_PATH_STROKE_CAP_BUTT:
-			((cap_style==gfx_capRound)?ART_PATH_STROKE_CAP_ROUND:
-			 ((cap_style==gfx_capSquare)?ART_PATH_STROKE_CAP_SQUARE:ART_PATH_STROKE_CAP_SQUARE)),
-			width, //line_width
-			miterLimit, //miter_limit
-			0.05 //flatness
-			);
-    free(vec);
-    return svp;
-}
-
-static gfxline_t* SVPtogfxline(ArtSVP*svp)
-{
-    int size = 0;
-    int t;
-    int pos = 0;
-    for(t=0;t<svp->n_segs;t++) {
-	size += svp->segs[t].n_points + 1;
-    }
-    gfxline_t* lines = (gfxline_t*)rfx_alloc(sizeof(gfxline_t)*size);
-
-    for(t=0;t<svp->n_segs;t++) {
-	ArtSVPSeg* seg = &svp->segs[t];
-	int p;
-	for(p=0;p<seg->n_points;p++) {
-	    lines[pos].type = p==0?gfx_moveTo:gfx_lineTo;
-	    ArtPoint* point = &seg->points[p];
-	    lines[pos].x = point->x;
-	    lines[pos].y = point->y;
-	    lines[pos].next = &lines[pos+1];
-	    pos++;
-	}
-    }
-    if(pos) {
-	lines[pos-1].next = 0;
-	return lines;
-    } else {
-	return 0;
-    }
-}
-
 /* TODO */
 static int imageInCache(gfxdevice_t*dev, void*data, int width, int height)
 {
@@ -2024,9 +1924,22 @@ static SRECT gfxline_getSWFbbox(gfxline_t*line)
     return r;
 }
 
+int line_is_empty(gfxline_t*line)
+{
+    while(line) {
+	if(line->type != gfx_moveTo)
+	    return 0;
+	line = line->next;
+    }
+    return 1;
+}
+
 static void swf_fillbitmap(gfxdevice_t*dev, gfxline_t*line, gfximage_t*img, gfxmatrix_t*matrix, gfxcxform_t*cxform)
 {
     swfoutput_internal*i = (swfoutput_internal*)dev->internal;
+    
+    if(line_is_empty(line))
+	return;
 
     endshape(dev);
     endtext(dev);
@@ -2142,6 +2055,7 @@ static int gfxline_type(gfxline_t*line)
     int lines=0;
     int splines=0;
     int haszerosegments=0;
+    int length=0;
     while(line) {
 	if(line->type == gfx_moveTo) {
 	    tmplines=0;
@@ -2155,8 +2069,11 @@ static int gfxline_type(gfxline_t*line)
 	    if(tmpsplines>lines)
 		splines=tmpsplines;
 	}
+	length++;
 	line = line->next;
     }
+    if(length>400)
+	return 5;
     if(lines==0 && splines==0) return 0;
     else if(lines==1 && splines==0) return 1;
     else if(lines==0 && splines==1) return 2;
@@ -2236,24 +2153,6 @@ static char is_inside_page(gfxdevice_t*dev, gfxcoord_t x, gfxcoord_t y)
     return 1;
 }
 
-static void show_path(ArtSVP*path)
-{
-    int t;
-    printf("Segments: %d\n", path->n_segs);
-    for(t=0;t<path->n_segs;t++) {
-	ArtSVPSeg* seg = &path->segs[t];
-	printf("Segment %d: %d points, %s, BBox: (%f,%f,%f,%f)\n", 
-		t, seg->n_points, seg->dir==0?"UP  ":"DOWN",
-		seg->bbox.x0, seg->bbox.y0, seg->bbox.x1, seg->bbox.y1);
-	int p;
-	for(p=0;p<seg->n_points;p++) {
-	    ArtPoint* point = &seg->points[p];
-	    printf("        (%f,%f)\n", point->x, point->y);
-	}
-    }
-    printf("\n");
-}
-
 gfxline_t* gfxline_move(gfxline_t*line, double x, double y)
 {
     gfxline_t*l = line = gfxline_clone(line);
@@ -2273,6 +2172,8 @@ gfxline_t* gfxline_move(gfxline_t*line, double x, double y)
 static void swf_stroke(gfxdevice_t*dev, gfxline_t*line, gfxcoord_t width, gfxcolor_t*color, gfx_capType cap_style, gfx_joinType joint_style, gfxcoord_t miterLimit)
 {
     swfoutput_internal*i = (swfoutput_internal*)dev->internal;
+    if(line_is_empty(line))
+	return;
     int type = gfxline_type(line);
     int has_dots = gfxline_has_dots(line);
     gfxbbox_t r = gfxline_getbbox(line);
@@ -2280,7 +2181,7 @@ 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 ||
+    if(i->config_disable_polygon_conversion || type>=5 ||
        (!has_dots &&
         (width <= i->config_caplinewidth 
         || (cap_style == gfx_capRound && joint_style == gfx_joinRound)
@@ -2328,6 +2229,8 @@ static void swf_stroke(gfxdevice_t*dev, gfxline_t*line, gfxcoord_t width, gfxcol
 static void swf_fill(gfxdevice_t*dev, gfxline_t*line, gfxcolor_t*color)
 {
     swfoutput_internal*i = (swfoutput_internal*)dev->internal;
+    if(line_is_empty(line))
+	return;
     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);
 
@@ -2360,6 +2263,8 @@ static void swf_fill(gfxdevice_t*dev, gfxline_t*line, gfxcolor_t*color)
 }
 static void swf_fillgradient(gfxdevice_t*dev, gfxline_t*line, gfxgradient_t*gradient, gfxgradienttype_t type, gfxmatrix_t*matrix)
 {
+    if(line_is_empty(line))
+	return;
     msg("<error> Gradient filling not implemented yet");
 }
 
@@ -2445,23 +2350,23 @@ static SWFFONT* gfxfont_to_swffont(gfxfont_t*font, char* id)
     return swffont;
 }
 
-static void swf_addfont(gfxdevice_t*dev, char*fontid, gfxfont_t*font)
+static void swf_addfont(gfxdevice_t*dev, gfxfont_t*font)
 {
     swfoutput_internal*i = (swfoutput_internal*)dev->internal;
 
-    if(i->swffont && i->swffont->name && !strcmp((char*)i->swffont->name,fontid))
+    if(i->swffont && i->swffont->name && !strcmp((char*)i->swffont->name,font->id))
 	return; // the requested font is the current font
     
     fontlist_t*last=0,*l = i->fontlist;
     while(l) {
 	last = l;
-	if(!strcmp((char*)l->swffont->name, fontid)) {
+	if(!strcmp((char*)l->swffont->name, font->id)) {
 	    return; // we already know this font
 	}
 	l = l->next;
     }
     l = (fontlist_t*)rfx_calloc(sizeof(fontlist_t));
-    l->swffont = gfxfont_to_swffont(font, fontid);
+    l->swffont = gfxfont_to_swffont(font, font->id);
     l->next = 0;
     if(last) {
 	last->next = l;
@@ -2473,7 +2378,7 @@ static void swf_addfont(gfxdevice_t*dev, char*fontid, gfxfont_t*font)
     if(getScreenLogLevel() >= LOGLEVEL_DEBUG)  {
 	int iii;
 	// print font information
-	msg("<debug> Font %s",fontid);
+	msg("<debug> Font %s",font->id);
 	msg("<debug> |   ID: %d", l->swffont->id);
 	msg("<debug> |   Version: %d", l->swffont->version);
 	msg("<debug> |   Name: %s", l->swffont->name);
@@ -2516,17 +2421,17 @@ static void swf_switchfont(gfxdevice_t*dev, char*fontid)
     return;
 }
 
-static void swf_drawchar(gfxdevice_t*dev, char*fontid, int glyph, gfxcolor_t*color, gfxmatrix_t*matrix)
+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(!i->swffont || !i->swffont->name || strcmp((char*)i->swffont->name,fontid)) // not equal to current font
+    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
 		 with multiple fonts */
 	endtext(dev);
 
-	swf_switchfont(dev, fontid); // set the current font
+	swf_switchfont(dev, font->id); // set the current font
     }
     swfoutput_setfontmatrix(dev, matrix->m00, matrix->m01, matrix->m10, matrix->m11);