X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Fgfxfont.c;h=119f003d1ef17eb1890bf4b67b30ccd215a8aa5c;hp=d206324cc3352fd58717d64101aad1d953cad380;hb=4f2366641015f517c0e4f841b7ae6a9b90c7b184;hpb=114fd977a15dcc7a9b52700279576cba80e6dc09

diff --git a/lib/gfxfont.c b/lib/gfxfont.c
index d206324..119f003 100644
--- a/lib/gfxfont.c
+++ b/lib/gfxfont.c
@@ -690,19 +690,22 @@ ttf_t* gfxfont_to_ttf(gfxfont_t*font)
 	    int g = font->unicode2glyph[u];
 	    if(invalid_unicode(u))
 		continue;
-	    if(g>=0 && !ttf->unicode[u]) {
+	    if(g>=0 && g<font->num_glyphs && !ttf->unicode[u]) {
 		ttf->unicode[u] = g+offset;
 	    }
 	}
     }
+	
     ttf->ascent = font->ascent;
-    ttf->descent = font->descent;
-    ttf->lineGap = font->ascent + font->descent;
+    ttf->descent = -font->descent;
+    ttf->lineGap = 0;
 
     ttf->full_name = strdup(font->id);
     ttf->family_name = strdup(font->id);
     ttf->subfamily_name = strdup(font->id);
+    ttf->postscript_name = strdup(font->id);
     ttf->version_string = strdup("Version 1.0");
+    ttf->font_uid = strdup(font->id);
 
     ttf_create_truetype_tables(ttf);
     return ttf;