X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=pdf2swf%2FSWFOutputDev.cc;h=262550c538cf69b7ceef6a843e45fa9c6ad8068d;hb=679bc1b62b72c098256a9bde8c49a61952efc069;hp=17eecb201bf5eab84f9a8ba95c6a6d24992358b6;hpb=e795670a7843a35bd56065c9c6bd8405f4b18566;p=swftools.git diff --git a/pdf2swf/SWFOutputDev.cc b/pdf2swf/SWFOutputDev.cc index 17eecb2..262550c 100644 --- a/pdf2swf/SWFOutputDev.cc +++ b/pdf2swf/SWFOutputDev.cc @@ -765,7 +765,7 @@ char*writeEmbeddedFontToFile(GfxFont*font) Type1CFontConverter *cvt; Ref embRef; Object refObj, strObj; - tmpFileName = "tmpfont"; + tmpFileName = "/tmp/tmpfont"; font->getEmbeddedFontID(&embRef); f = fopen(tmpFileName, "wb"); @@ -804,11 +804,6 @@ char*writeEmbeddedFontToFile(GfxFont*font) return fileName; } -int embeddedids[128]; -int embeddedt1ids[128]; -int embedded_mappos = 0; -int embedded_maxpos = 128; - char* gfxFontName(GfxFont* gfxFont) { GString *gstr; @@ -851,35 +846,20 @@ void SWFOutputDev::updateFont(GfxState *state) Ref embRef; GBool embedded = gfxFont->getEmbeddedFontID(&embRef); if(embedded) { - int t; - for(t=0;tis16Bit() && - (gfxFont->getType() == fontType1 || - gfxFont->getType() == fontType1C)) { - - fileName = writeEmbeddedFontToFile(gfxFont); - if(!fileName) - return ; - } - else { - showFontError(gfxFont,0); - return ; - } + if (!gfxFont->is16Bit() && + (gfxFont->getType() == fontType1 || + gfxFont->getType() == fontType1C)) { - t1id = T1_AddFont(fileName); - embeddedids[embedded_mappos] = embRef.num; - embeddedt1ids[embedded_mappos] = t1id; - if(embedded_mappos < embedded_maxpos-1) - embedded_mappos++; + fileName = writeEmbeddedFontToFile(gfxFont); + if(!fileName) + return ; } - else - { - t1id = embeddedt1ids[t]; + else { + showFontError(gfxFont,0); + return ; } + + t1id = T1_AddFont(fileName); } else { fontname = NULL; if(gfxFont->getName()) {