X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Ffilters%2Fremove_font_transforms.c;h=748ba224d65e163c6abbecc17e20792a8975c509;hp=afcc62f39d1ba7719c7ab5daa2db8f068625aa0e;hb=b2c998ea7f4c97fd0640967fe5fee0e8789cf761;hpb=6b420806fea03cbd86d5a6d55b112010b15cbba3

diff --git a/lib/filters/remove_font_transforms.c b/lib/filters/remove_font_transforms.c
index afcc62f..748ba22 100644
--- a/lib/filters/remove_font_transforms.c
+++ b/lib/filters/remove_font_transforms.c
@@ -129,7 +129,7 @@ typedef struct _transformedfont {
     gfxfont_t*font;
     mymatrix_t matrix;
     int*used;
-    double dx,dy;
+    double dx;
 } transformedfont_t;
 
 static transformedfont_t* transformedfont_new(gfxfont_t*orig, mymatrix_t*m)
@@ -210,15 +210,15 @@ static gfxresult_t* pass1_finish(gfxfilter_t*f, gfxdevice_t*out)
 	    average_xmax /= count;
 
 	fd->dx = -total.xmin;
-	fd->dy = 0;
+
+	font->ascent = total.ymax;
+	font->descent = total.ymin;
 
 	for(t=0;t<count;t++) {
 	    gfxline_t*line = font->glyphs[t].line;
 	    while(line) {
 		line->x += fd->dx;
-		line->y += fd->dy;
 		line->sx += fd->dx;
-		line->sy += fd->dy;
 		line = line->next;
 	    }
 	}
@@ -248,8 +248,7 @@ static void pass2_drawchar(gfxfilter_t*f, gfxfont_t*font, int glyphnr, gfxcolor_
     gfxmatrix_t scalematrix;
     matrix_convert(matrix, font->id, &m, &scalematrix);
     transformedfont_t*d = dict_lookup(i->matrices, &m);
-    scalematrix.tx -= d->dx;
-    scalematrix.ty -= d->dy;
+    scalematrix.tx -= d->dx*scalematrix.m00;
     out->drawchar(out, d->font, d->used[glyphnr], color, &scalematrix);
 }
 
@@ -266,6 +265,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;