X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Ffilters%2Fremove_font_transforms.c;h=c94ee94976d73021731b71acf603df71a6ff8577;hp=4a23cfd648f70eba909e0606bb7aae47f6c6b6ff;hb=a51d4f82e57c96baa125d0937870d1e4896d6ee3;hpb=3a83c30dd2f4e2f94b008ccf03a0c3710c99c349

diff --git a/lib/filters/remove_font_transforms.c b/lib/filters/remove_font_transforms.c
index 4a23cfd..c94ee94 100644
--- a/lib/filters/remove_font_transforms.c
+++ b/lib/filters/remove_font_transforms.c
@@ -99,7 +99,7 @@ void matrix_convert(gfxmatrix_t*in, const char*id, mymatrix_t*out, gfxmatrix_t*s
 {
     double l1 = sqrt(in->m00 * in->m00 + in->m01 * in->m01);
     double l2 = sqrt(in->m10 * in->m10 + in->m11 * in->m11);
-    double l = l1+l2;
+    double l = (l1+l2)/2.0;
     if(l < 1e-10) {
 	memset(out, 0, sizeof(*out));
 	return;
@@ -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)
@@ -137,7 +137,12 @@ static transformedfont_t* transformedfont_new(gfxfont_t*orig, mymatrix_t*m)
     transformedfont_t*f = rfx_calloc(sizeof(transformedfont_t));
     f->orig = orig;
     f->matrix = *m;
-    f->used = malloc(sizeof(f->used[0])*orig->num_glyphs);
+    f->used = rfx_calloc(sizeof(f->used[0])*orig->num_glyphs);
+    int t;
+    for(t=0;t<orig->num_glyphs;t++) {
+	if(orig->glyphs[t].unicode==32)
+	    f->used[t]=1; //always preserve the space char in fonts
+    }
     return f;
 }
 
@@ -145,7 +150,9 @@ static void pass1_drawchar(gfxfilter_t*f, gfxfont_t*font, int glyphnr, gfxcolor_
 {
     internal_t*i = (internal_t*)f->internal;
     mymatrix_t m;
-    matrix_convert(matrix, font->id, &m, 0);
+    if(!font->id) 
+	msg("<error> Font has no ID");
+    matrix_convert(matrix, font->id?font->id:"unknown", &m, 0);
     transformedfont_t*fd = dict_lookup(i->matrices, &m);
     if(!fd) {
 	fd = transformedfont_new(font, &m);
@@ -210,15 +217,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;
 	    }
 	}
@@ -246,10 +253,9 @@ static void pass2_drawchar(gfxfilter_t*f, gfxfont_t*font, int glyphnr, gfxcolor_
 
     mymatrix_t m;
     gfxmatrix_t scalematrix;
-    matrix_convert(matrix, font->id, &m, &scalematrix);
+    matrix_convert(matrix, font->id?font->id:"unknown", &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);
 }