X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fgfxfont.c;h=6ec1a4fc865af8e2f885ce0c1d7928a2c137c98b;hb=796482f45946c67804ab2ca5f8b33a020d71a779;hp=8a704fd3a717961614b7a4475c5c86cbb659faca;hpb=1479fbb7a5df24eb7c12e00e6be63465267dd679;p=swftools.git

diff --git a/lib/gfxfont.c b/lib/gfxfont.c
index 8a704fd..6ec1a4f 100644
--- a/lib/gfxfont.c
+++ b/lib/gfxfont.c
@@ -211,11 +211,13 @@ gfxfont_t* gfxfont_load(char*filename, double quality)
 	   the encoding is no longer unicode. 
 	   TODO: find a way to convert the encoding to unicode
 	 */
-	if(font->max_unicode == 0 && charmap < face->num_charmaps - 1) {
+	if(font->max_unicode == 0 && charmap < face->num_charmaps-1 && 
+		face->charmaps[charmap+1]->encoding != 0x41444243 /* custom */)
+		{
 	    charmap++;
 	    FT_Set_Charmap(face, face->charmaps[charmap]);
 	    isunicode = 0;
-	} else 
+	} else
 	    break;
     }
 
@@ -336,7 +338,7 @@ gfxfont_t* gfxfont_load(char*filename, double quality)
 		FT_Done_Glyph(glyph);
 		omit = 4;
 	    } else {
-		font->glyphs[font->num_glyphs].advance = glyph->advance.x*20/65536;
+		font->glyphs[font->num_glyphs].advance = (glyph->advance.x*20)/65536;
 		font->glyphs[font->num_glyphs].line = (gfxline_t*)draw.result(&draw);
 	    }
 	    l = font->glyphs[font->num_glyphs].line;