X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fmodules%2Fswffont.c;h=bbc78d9e1c8fdb429f1cefe10a559ca80f9760da;hb=19692420849850353a7caf75201f8044359e7627;hp=9a572e1f7e66bbe520b9522c910d28d657136a74;hpb=0720ce023d5ae1913d6f53627d4705b7a7856c40;p=swftools.git

diff --git a/lib/modules/swffont.c b/lib/modules/swffont.c
index 9a572e1..bbc78d9 100644
--- a/lib/modules/swffont.c
+++ b/lib/modules/swffont.c
@@ -131,7 +131,7 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
     }
 
     font->layout->ascent = face->ascender; //face->bbox.xMin;
-    font->layout->descent = face->descender; //face->bbox.xMax;
+    font->layout->descent = abs(face->descender); //face->bbox.xMax;
     font->layout->leading = -face->bbox.xMin;
     font->layout->kerningcount = 0;
     
@@ -224,7 +224,7 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
 	    font->glyph[t].advance = ((bbox.xMax - bbox.xMin)*FT_SCALE)/FT_SUBPIXELS;
 	}
 #else
-	font->glyph[t].advance = glyph->advance.x/65536;
+	font->glyph[t].advance = glyph->advance.x*20/65536;
 #endif
 	
 	font->glyph[t].shape = swf_ShapeDrawerToShape(&draw);
@@ -392,7 +392,7 @@ SWFFONT* swf_LoadT1Font(char*filename)
 	draw.dealloc(&draw);
 	    
 	font->layout->bounds[c] = bbox;
-	font->glyph[c].advance = bbox.xmax/20;
+	font->glyph[c].advance = bbox.xmax;
 	if(!font->glyph[c].advance) {
 	    font->glyph[c].advance = firstx;
 	}