X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fgfxfont.c;h=6ec1a4fc865af8e2f885ce0c1d7928a2c137c98b;hb=796482f45946c67804ab2ca5f8b33a020d71a779;hp=1c6bf5f4fbc1866eb368f109ba303436dc5fd17d;hpb=fe75117d237d19d4df7b1788a505ccd32d5d9816;p=swftools.git

diff --git a/lib/gfxfont.c b/lib/gfxfont.c
index 1c6bf5f..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;
     }