X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=pdf2swf%2Fswfoutput.cc;h=25fa510bad9a43afb9039f18398f01f05f082033;hb=c71ce9b62dc70d2ab901f642000e5929c692314e;hp=5d1c10f7a94dfa9535e0017e9be2bb56dd180471;hpb=5eb026e91bef063b683796fbbc03158d5711a4e4;p=swftools.git diff --git a/pdf2swf/swfoutput.cc b/pdf2swf/swfoutput.cc index 5d1c10f..25fa510 100644 --- a/pdf2swf/swfoutput.cc +++ b/pdf2swf/swfoutput.cc @@ -1167,11 +1167,6 @@ int getCharID(SWFFONT *font, int charnr, char *charname, int u) } } - if(charnr>=0 && charnrnumchars) { - msg(" Char [>%d<,%s,%d] maps to %d\n", charnr, charname, u, charnr); - return charnr; - } - if(font->encoding != FONT_ENCODING_UNICODE) { /* the following only works if the font encoding is US-ASCII based. It's needed for fonts which return broken unicode @@ -1180,8 +1175,13 @@ int getCharID(SWFFONT *font, int charnr, char *charname, int u) msg(" Char [>%d<,%s,%d] maps to %d\n", charnr, charname, u, font->ascii2glyph[charnr]); return font->ascii2glyph[charnr]; } + } + + if(charnr>=0 && charnrnumchars) { + msg(" Char [>%d<,%s,%d] maps to %d\n", charnr, charname, u, charnr); + return charnr; } - + return -1; }