X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Ffilters%2Fremove_font_transforms.c;h=95db4ca73fab1cd2b937c865e4e49504cec88264;hb=fdd99ebecfef4874ea12bc97839fa027a0e8ed2f;hp=16d02add7576cf18e89786e49ae7a307d7f66d49;hpb=b9f1e7011f2ad4be624ab777a5091623a807b3d9;p=swftools.git

diff --git a/lib/filters/remove_font_transforms.c b/lib/filters/remove_font_transforms.c
index 16d02ad..95db4ca 100644
--- a/lib/filters/remove_font_transforms.c
+++ b/lib/filters/remove_font_transforms.c
@@ -166,6 +166,8 @@ static void glyph_transform(gfxglyph_t*g, mymatrix_t*mm)
     m.ty = 0;
     g->line = gfxline_clone(g->line);
     gfxline_transform(g->line, &m);
+    if(m.m00>0)
+	g->advance *= m.m00;
 }
 
 static gfxresult_t* pass1_finish(gfxfilter_t*f, gfxdevice_t*out)
@@ -203,8 +205,6 @@ static gfxresult_t* pass1_finish(gfxfilter_t*f, gfxdevice_t*out)
 	    gfxline_t*line = font->glyphs[t].line;
 	    gfxbbox_t b = gfxline_getbbox(line);
 	    total = gfxbbox_expand_to_bbox(total, b);
-	    if(b.xmax > 0)
-		font->glyphs[t].advance = b.xmax;
 	}
 	if(count) 
 	    average_xmax /= count;
@@ -212,11 +212,11 @@ static gfxresult_t* pass1_finish(gfxfilter_t*f, gfxdevice_t*out)
 	fd->dx = -total.xmin;
 	fd->dy = 0;
 
-	double adx = fd->dx>0?fd->dx:0;
-	
+	font->ascent = total.ymax;
+	font->descent = total.ymin;
+
 	for(t=0;t<count;t++) {
 	    gfxline_t*line = font->glyphs[t].line;
-	    font->glyphs[t].advance += adx;
 	    while(line) {
 		line->x += fd->dx;
 		line->y += fd->dy;
@@ -230,6 +230,12 @@ static gfxresult_t* pass1_finish(gfxfilter_t*f, gfxdevice_t*out)
     return out->finish(out);
 }
 
+static void pass2_addfont(gfxfilter_t*f, gfxfont_t*font, gfxdevice_t*out)
+{
+    /* we throw away original fonts, and do the addfont() for the transformed
+       fonts in the first drawchar() */
+}
+
 static void pass2_drawchar(gfxfilter_t*f, gfxfont_t*font, int glyphnr, gfxcolor_t*color, gfxmatrix_t*matrix, gfxdevice_t*out)
 {
     internal_t*i = (internal_t*)f->internal;
@@ -263,6 +269,7 @@ void gfxtwopassfilter_remove_font_transforms_init(gfxtwopassfilter_t*f)
     f->pass1.internal = i;
 
     f->pass2.name = "remove font transforms pass 2";
+    f->pass2.addfont = pass2_addfont;
     f->pass2.drawchar = pass2_drawchar;
     f->pass2.internal = i;