X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=pdf2swf%2FSWFOutputDev.cc;h=b9454d01522f9d3cc18118b91de5cb526cba5f62;hb=58beb064a7369429483e1a3dcd058cbf68074cfc;hp=04676e15b3777de278293432ee1dc414b1a44372;hpb=de33f30e51e402a889d32738dfbbf524fe6412c9;p=swftools.git diff --git a/pdf2swf/SWFOutputDev.cc b/pdf2swf/SWFOutputDev.cc index 04676e1..b9454d0 100644 --- a/pdf2swf/SWFOutputDev.cc +++ b/pdf2swf/SWFOutputDev.cc @@ -986,7 +986,8 @@ char*SWFOutputDev::writeEmbeddedFontToFile(XRef*ref, GfxFont*font) Type1CFontFile *cvt; Ref embRef; Object refObj, strObj; - tmpFileName = "/tmp/tmpfont"; + char namebuf[512]; + tmpFileName = mktmpname(namebuf); int ret; ret = font->getEmbeddedFontID(&embRef); @@ -1055,25 +1056,25 @@ char*SWFOutputDev::writeEmbeddedFontToFile(XRef*ref, GfxFont*font) msg(" File contains TrueType fonts"); ttfinfo = 1; } - char name2[80]; + char name2[512]; char*tmp; tmp = strdup(mktmpname((char*)name2)); sprintf(name2, "%s", tmp); - char*a[] = {"./ttf2pt1", "-W0", + char*a[] = {"./ttf2pt1", "-W", "0", #ifndef USE_FREETYPE - "-pttf", + "-p", "ttf", #else - "-pft", + "-p", "ft", #endif "-b", tmpFileName, name2}; - msg(" Invoking %s %s %s %s %s %s",a[0],a[1],a[2],a[3],a[4],a[5]); - ttf2pt1_main(6,a); + msg(" Invoking %s %s %s %s %s %s %s %s",a[0],a[1],a[2],a[3],a[4],a[5],a[6],a[7]); + ttf2pt1_main(8,a); unlink(tmpFileName); sprintf(name2,"%s.pfb",tmp); tmpFileName = strdup(name2); } - return tmpFileName; + return strdup(tmpFileName); } char* gfxFontName(GfxFont* gfxFont) @@ -1292,7 +1293,7 @@ void SWFOutputDev::updateFont(GfxState *state) } this->t1id = T1_AddFont(fileName); if(this->t1id<0) { - msg(" Couldn't load font from file"); + msg(" Couldn't load font from file %s", fileName); showFontError(gfxFont,0); unlinkfont(fileName); return ;