X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=pdf2swf%2FSWFOutputDev.cc;h=6dafd03fd4ac78e68e6e9db241bdcb6760b5d8bf;hb=9aa850fb4c4b28c64d53e144b4a107d982917b2e;hp=193dd44898c5e22d1bf94e51dd874571114d9e4f;hpb=89a58fa0255a580a615cb1d0e62236cb9d882fcd;p=swftools.git diff --git a/pdf2swf/SWFOutputDev.cc b/pdf2swf/SWFOutputDev.cc index 193dd44..6dafd03 100644 --- a/pdf2swf/SWFOutputDev.cc +++ b/pdf2swf/SWFOutputDev.cc @@ -46,31 +46,29 @@ #include "GlobalParams.h" //swftools header files #include "swfoutput.h" -extern "C" { #include "../lib/log.h" -#include "ttf2pt1.h" -} -#define logf logarithmf // logf is also used by ../lib/log.h #include -#undef logf static PDFDoc*doc = 0; static char* swffilename = 0; -int numpages; -int currentpage; +static int numpages; +static int currentpage; + +static char*fonts[2048]; +static int fontnum = 0; // swf <-> pdf pages -int*pages = 0; -int pagebuflen = 0; -int pagepos = 0; +static int*pages = 0; +static int pagebuflen = 0; +static int pagepos = 0; -double caplinewidth = 3.0; +static double caplinewidth = 3.0; static void printInfoString(Dict *infoDict, char *key, char *fmt); static void printInfoDate(Dict *infoDict, char *key, char *fmt); -double fontsizes[] = +static double fontsizes[] = { 0.833,0.833,0.889,0.889, 0.788,0.722,0.833,0.778, @@ -78,7 +76,7 @@ double fontsizes[] = 0.576,0.576,0.576,0.576, 0.733 //? }; -char*fontnames[]={ +static char*fontnames[]={ "Helvetica", "Helvetica-Bold", "Helvetica-BoldOblique", @@ -103,20 +101,20 @@ struct mapping { char*filename; int id; } pdf2t1map[] ={ -{"Times-Roman", "n021003l.pfb"}, -{"Times-Italic", "n021023l.pfb"}, -{"Times-Bold", "n021004l.pfb"}, -{"Times-BoldItalic", "n021024l.pfb"}, -{"Helvetica", "n019003l.pfb"}, -{"Helvetica-Oblique", "n019023l.pfb"}, -{"Helvetica-Bold", "n019004l.pfb"}, -{"Helvetica-BoldOblique", "n019024l.pfb"}, -{"Courier", "n022003l.pfb"}, -{"Courier-Oblique", "n022023l.pfb"}, -{"Courier-Bold", "n022004l.pfb"}, -{"Courier-BoldOblique", "n022024l.pfb"}, -{"Symbol", "s050000l.pfb"}, -{"ZapfDingbats", "d050000l.pfb"}}; +{"Times-Roman", "n021003l"}, +{"Times-Italic", "n021023l"}, +{"Times-Bold", "n021004l"}, +{"Times-BoldItalic", "n021024l"}, +{"Helvetica", "n019003l"}, +{"Helvetica-Oblique", "n019023l"}, +{"Helvetica-Bold", "n019004l"}, +{"Helvetica-BoldOblique", "n019024l"}, +{"Courier", "n022003l"}, +{"Courier-Oblique", "n022023l"}, +{"Courier-Bold", "n022004l"}, +{"Courier-BoldOblique", "n022024l"}, +{"Symbol", "s050000l"}, +{"ZapfDingbats", "d050000l"}}; class GfxState; class GfxImageColorMap; @@ -148,7 +146,7 @@ public: void startDoc(XRef *xref); // Start a page. - virtual void startPage(int pageNum, GfxState *state) ; + virtual void startPage(int pageNum, GfxState *state, double x1, double y1, double x2, double y2) ; //----- link borders virtual void drawLink(Link *link, Catalog *catalog) ; @@ -214,7 +212,7 @@ public: XRef*xref; - int searchT1Font(char*name); + char* searchFont(char*name); char* substituteFont(GfxFont*gfxFont, char*oldname); char* writeEmbeddedFontToFile(XRef*ref, GfxFont*font); int t1id; @@ -228,6 +226,22 @@ public: GfxState *laststate; }; +char*getFontName(GfxFont*font) +{ + GString*gstr = font->getName(); + char* fontname = gstr==0?0:gstr->getCString(); + if(fontname==0) { + char buf[32]; + Ref*r=font->getID(); + sprintf(buf, "UFONT%d", r->num); + return strdup(buf); + } + char* plus = strchr(fontname, '+'); + if(plus && plus < &fontname[strlen(fontname)-1]) + fontname = plus+1; + return fontname; +} + char mybuf[1024]; char* gfxstate2str(GfxState *state) { @@ -307,8 +321,8 @@ char* gfxstate2str(GfxState *state) if(state->getLineJoin()!=0) bufpos+=sprintf(bufpos,"ML%d ", state->getMiterLimit()); - if(state->getFont() && state->getFont()->getName() && state->getFont()->getName()->getCString()) - bufpos+=sprintf(bufpos,"F\"%s\" ",((state->getFont())->getName())->getCString()); + if(state->getFont() && getFontName(state->getFont())) + bufpos+=sprintf(bufpos,"F\"%s\" ",getFontName(state->getFont())); bufpos+=sprintf(bufpos,"FS%.1f ", state->getFontSize()); bufpos+=sprintf(bufpos,"MAT[%.1f/%.1f/%.1f/%.1f/%.1f/%.1f] ", state->getTextMat()[0],state->getTextMat()[1],state->getTextMat()[2], state->getTextMat()[3],state->getTextMat()[4],state->getTextMat()[5]); @@ -335,6 +349,8 @@ char* gfxstate2str(GfxState *state) return mybuf; } + + void dumpFontInfo(char*loglevel, GfxFont*font); int lastdumps[1024]; int lastdumppos = 0; @@ -354,53 +370,51 @@ void showFontError(GfxFont*font, int nr) if(lastdumpposnum; if(nr == 0) - logf(" The following font caused problems:"); + msg(" The following font caused problems:"); else if(nr == 1) - logf(" The following font caused problems (substituting):"); + msg(" The following font caused problems (substituting):"); else if(nr == 2) - logf(" The following Type 3 Font will be rendered as bitmap:"); + msg(" The following Type 3 Font will be rendered as bitmap:"); dumpFontInfo("", font); } void dumpFontInfo(char*loglevel, GfxFont*font) { - GString *gstr; - char*name = 0; - gstr = font->getName(); + char* name = getFontName(font); Ref* r=font->getID(); - logf("%s=========== %s (ID:%d,%d) ==========\n", loglevel, gstr?FIXNULL(gstr->getCString()):"(unknown font)", r->num,r->gen); + msg("%s=========== %s (ID:%d,%d) ==========\n", loglevel, name, r->num,r->gen); - gstr = font->getTag(); - if(gstr) - logf("%sTag: %s\n", loglevel, FIXNULL(gstr->getCString())); + GString*gstr = font->getTag(); + + msg("%sTag: %s\n", loglevel, name); - if(font->isCIDFont()) logf("%sis CID font\n", loglevel); + if(font->isCIDFont()) msg("%sis CID font\n", loglevel); GfxFontType type=font->getType(); switch(type) { case fontUnknownType: - logf("%sType: unknown\n",loglevel); + msg("%sType: unknown\n",loglevel); break; case fontType1: - logf("%sType: 1\n",loglevel); + msg("%sType: 1\n",loglevel); break; case fontType1C: - logf("%sType: 1C\n",loglevel); + msg("%sType: 1C\n",loglevel); break; case fontType3: - logf("%sType: 3\n",loglevel); + msg("%sType: 3\n",loglevel); break; case fontTrueType: - logf("%sType: TrueType\n",loglevel); + msg("%sType: TrueType\n",loglevel); break; case fontCIDType0: - logf("%sType: CIDType0\n",loglevel); + msg("%sType: CIDType0\n",loglevel); break; case fontCIDType0C: - logf("%sType: CIDType0C\n",loglevel); + msg("%sType: CIDType0C\n",loglevel); break; case fontCIDType2: - logf("%sType: CIDType2\n",loglevel); + msg("%sType: CIDType2\n",loglevel); break; } @@ -409,18 +423,18 @@ void dumpFontInfo(char*loglevel, GfxFont*font) if(font->getEmbeddedFontName()) name = font->getEmbeddedFontName()->getCString(); if(embedded) - logf("%sEmbedded name: %s id: %d\n",loglevel, FIXNULL(name), embRef.num); + msg("%sEmbedded name: %s id: %d\n",loglevel, FIXNULL(name), embRef.num); gstr = font->getExtFontFile(); if(gstr) - logf("%sExternal Font file: %s\n", loglevel, FIXNULL(gstr->getCString())); + msg("%sExternal Font file: %s\n", loglevel, FIXNULL(gstr->getCString())); // Get font descriptor flags. - if(font->isFixedWidth()) logf("%sis fixed width\n", loglevel); - if(font->isSerif()) logf("%sis serif\n", loglevel); - if(font->isSymbolic()) logf("%sis symbolic\n", loglevel); - if(font->isItalic()) logf("%sis italic\n", loglevel); - if(font->isBold()) logf("%sis bold\n", loglevel); + if(font->isFixedWidth()) msg("%sis fixed width\n", loglevel); + if(font->isSerif()) msg("%sis serif\n", loglevel); + if(font->isSymbolic()) msg("%sis symbolic\n", loglevel); + if(font->isItalic()) msg("%sis italic\n", loglevel); + if(font->isBold()) msg("%sis bold\n", loglevel); } //void SWFOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str, int width, int height, GBool invert, GBool inlineImg) {printf("void SWFOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str, int width, int height, GBool invert, GBool inlineImg) \n");} @@ -440,7 +454,7 @@ SWFOutputDev::SWFOutputDev() // printf("SWFOutputDev::SWFOutputDev() \n"); }; -T1_OUTLINE* gfxPath_to_T1_OUTLINE(GfxState*state, GfxPath*path) +SWF_OUTLINE* gfxPath_to_SWF_OUTLINE(GfxState*state, GfxPath*path) { int num = path->getNumSubpaths(); int s,t; @@ -449,12 +463,12 @@ T1_OUTLINE* gfxPath_to_T1_OUTLINE(GfxState*state, GfxPath*path) int cpos = 0; double lastx=0,lasty=0; if(!num) { - logf(" empty path"); - outline->type = T1_PATHTYPE_MOVE; + msg(" empty path"); + outline->type = SWF_PATHTYPE_MOVE; outline->dest.x = 0; outline->dest.y = 0; outline->link = 0; - return (T1_OUTLINE*)outline; + return (SWF_OUTLINE*)outline; } for(t = 0; t < num; t++) { GfxSubpath *subpath = path->getSubpath(t); @@ -468,10 +482,10 @@ T1_OUTLINE* gfxPath_to_T1_OUTLINE(GfxState*state, GfxPath*path) if(s==0) { last = outline; - outline->type = T1_PATHTYPE_MOVE; + outline->type = SWF_PATHTYPE_MOVE; outline->dest.x = x; outline->dest.y = y; - outline->link = (T1_OUTLINE*)new bezierpathsegment(); + outline->link = (SWF_OUTLINE*)new bezierpathsegment(); outline = (bezierpathsegment*)outline->link; cpos = 0; lastx = nx; @@ -494,9 +508,9 @@ T1_OUTLINE* gfxPath_to_T1_OUTLINE(GfxState*state, GfxPath*path) last = outline; outline->dest.x = x; outline->dest.y = y; - outline->type = cpos?T1_PATHTYPE_BEZIER:T1_PATHTYPE_LINE; + outline->type = cpos?SWF_PATHTYPE_BEZIER:SWF_PATHTYPE_LINE; outline->link = 0; - outline->link = (T1_OUTLINE*)new bezierpathsegment(); + outline->link = (SWF_OUTLINE*)new bezierpathsegment(); outline = (bezierpathsegment*)outline->link; cpos = 0; lastx = nx; @@ -505,7 +519,7 @@ T1_OUTLINE* gfxPath_to_T1_OUTLINE(GfxState*state, GfxPath*path) } } last->link = 0; - return (T1_OUTLINE*)start; + return (SWF_OUTLINE*)start; } /*---------------------------------------------------------------------------- * Primitive Graphic routines @@ -513,7 +527,7 @@ T1_OUTLINE* gfxPath_to_T1_OUTLINE(GfxState*state, GfxPath*path) void SWFOutputDev::stroke(GfxState *state) { - logf(" stroke\n"); + msg(" stroke\n"); GfxPath * path = state->getPath(); int lineCap = state->getLineCap(); // 0=butt, 1=round 2=square int lineJoin = state->getLineJoin(); // 0=miter, 1=round 2=bevel @@ -526,7 +540,7 @@ void SWFOutputDev::stroke(GfxState *state) m.m11 = 1; m.m21 = 0; m.m22 = 1; m.m12 = 0; m.m13 = 0; m.m23 = 0; - T1_OUTLINE*outline = gfxPath_to_T1_OUTLINE(state, path); + SWF_OUTLINE*outline = gfxPath_to_SWF_OUTLINE(state, path); lineJoin = 1; // other line joins are not yet supported by the swf encoder // TODO: support bevel joints @@ -552,46 +566,46 @@ void SWFOutputDev::stroke(GfxState *state) } void SWFOutputDev::fill(GfxState *state) { - logf(" fill\n"); + msg(" fill\n"); GfxPath * path = state->getPath(); struct swfmatrix m; m.m11 = 1; m.m21 = 0; m.m22 = 1; m.m12 = 0; m.m13 = 0; m.m23 = 0; - T1_OUTLINE*outline = gfxPath_to_T1_OUTLINE(state, path); + SWF_OUTLINE*outline = gfxPath_to_SWF_OUTLINE(state, path); swfoutput_setdrawmode(&output, DRAWMODE_FILL); swfoutput_drawpath(&output, outline, &m); } void SWFOutputDev::eoFill(GfxState *state) { - logf(" eofill\n"); + msg(" eofill\n"); GfxPath * path = state->getPath(); struct swfmatrix m; m.m11 = 1; m.m21 = 0; m.m22 = 1; m.m12 = 0; m.m13 = 0; m.m23 = 0; - T1_OUTLINE*outline = gfxPath_to_T1_OUTLINE(state, path); + SWF_OUTLINE*outline = gfxPath_to_SWF_OUTLINE(state, path); swfoutput_setdrawmode(&output, DRAWMODE_EOFILL); swfoutput_drawpath(&output, outline, &m); } void SWFOutputDev::clip(GfxState *state) { - logf(" clip\n"); + msg(" clip\n"); GfxPath * path = state->getPath(); struct swfmatrix m; m.m11 = 1; m.m22 = 1; m.m12 = 0; m.m21 = 0; m.m13 = 0; m.m23 = 0; - T1_OUTLINE*outline = gfxPath_to_T1_OUTLINE(state, path); + SWF_OUTLINE*outline = gfxPath_to_SWF_OUTLINE(state, path); swfoutput_startclip(&output, outline, &m); clipping[clippos] ++; } void SWFOutputDev::eoClip(GfxState *state) { - logf(" eoclip\n"); + msg(" eoclip\n"); GfxPath * path = state->getPath(); struct swfmatrix m; m.m11 = 1; m.m21 = 0; m.m22 = 1; m.m12 = 0; m.m13 = 0; m.m23 = 0; - T1_OUTLINE*outline = gfxPath_to_T1_OUTLINE(state, path); + SWF_OUTLINE*outline = gfxPath_to_SWF_OUTLINE(state, path); swfoutput_startclip(&output, outline, &m); clipping[clippos] ++; } @@ -603,19 +617,19 @@ SWFOutputDev::~SWFOutputDev() }; GBool SWFOutputDev::upsideDown() { - logf(" upsidedown?"); + msg(" upsidedown?"); return gTrue; }; GBool SWFOutputDev::useDrawChar() { - logf(" usedrawchar?"); + msg(" usedrawchar?"); return gTrue; } void SWFOutputDev::beginString(GfxState *state, GString *s) { double m11,m21,m12,m22; -// logf(" %s beginstring \"%s\"\n", gfxstate2str(state), s->getCString()); +// msg(" %s beginstring \"%s\"\n", gfxstate2str(state), s->getCString()); state->getFontTransMat(&m11, &m12, &m21, &m22); m11 *= state->getHorizScaling(); m21 *= state->getHorizScaling(); @@ -628,8 +642,6 @@ void SWFOutputDev::drawChar(GfxState *state, double x, double y, double originX, double originY, CharCode c, Unicode *_u, int uLen) { - logf(" drawChar(%f,%f,%f,%f,'%c')\n",x,y,dx,dy,c); - // check for invisible text -- this is used by Acrobat Capture if ((state->getRender() & 3) == 3) return; @@ -644,13 +656,16 @@ void SWFOutputDev::drawChar(GfxState *state, double x, double y, x1 = x; y1 = y; state->transform(x, y, &x1, &y1); + + Unicode u=0; + if(_u) + u = *_u; + + msg(" drawChar(%f,%f,%f,%f,c='%c' (%d),u=%d) CID=%d\n",x,y,dx,dy,c,c,u, font->isCIDFont()); if(font->isCIDFont()) { GfxCIDFont*cfont = (GfxCIDFont*)font; - Unicode u=0; char*name=0; - if(_u) - u = *_u; if(u) { int t; for(t=0;tgetName()->getCString(), - cfont->getType());*/ if(name) - swfoutput_drawchar(&output, x1, y1, name, c); - else - logf(" couldn't get name for CID character %02x from Encoding", c); + swfoutput_drawchar(&output, x1, y1, name, c, u); + else { + swfoutput_drawchar(&output, x1, y1, 0, c, u); + } } else { Gfx8BitFont*font8; font8 = (Gfx8BitFont*)font; char**enc=font8->getEncoding(); if(enc && enc[c]) - swfoutput_drawchar(&output, x1, y1, enc[c], c); + swfoutput_drawchar(&output, x1, y1, enc[c], c, u); else { - logf(" couldn't get name for character %02x from Encoding", c); + swfoutput_drawchar(&output, x1, y1, 0, c, u); } } } void SWFOutputDev::endString(GfxState *state) { - logf(" endstring\n"); + msg(" endstring\n"); } GBool SWFOutputDev::beginType3Char(GfxState *state, CharCode code, Unicode *u, int uLen) { - logf(" beginType3Char %d, %08x, %d", code, *u, uLen); + msg(" beginType3Char %d, %08x, %d", code, *u, uLen); type3active = 1; /* the character itself is going to be passed using drawImageMask() */ @@ -699,20 +713,31 @@ GBool SWFOutputDev::beginType3Char(GfxState *state, void SWFOutputDev::endType3Char(GfxState *state) { type3active = 0; - logf(" endType3Char"); + msg(" endType3Char"); } -void SWFOutputDev::startPage(int pageNum, GfxState *state) +void SWFOutputDev::startPage(int pageNum, GfxState *state, double crop_x1, double crop_y1, double crop_x2, double crop_y2) { double x1,y1,x2,y2; laststate = state; - logf(" startPage %d\n", pageNum); - logf(" processing page %d", pageNum); + msg(" startPage %d (%f,%f,%f,%f)\n", pageNum, crop_x1, crop_y1, crop_x2, crop_y2); + msg(" processing page %d", pageNum); - state->transform(state->getX1(),state->getY1(),&x1,&y1); + /* state->transform(state->getX1(),state->getY1(),&x1,&y1); state->transform(state->getX2(),state->getY2(),&x2,&y2); + Use CropBox, not MediaBox, as page size + */ + x1 = crop_x1; + y1 = crop_y1; + x2 = crop_x2; + y2 = crop_y2; + + if(x2 Bounding box is (%f,%f)-(%f,%f)", x1,y1,x2,y2); + swfoutput_init(&output, swffilename,(int)x1,(int)y1,(int)x2,(int)y2); outputstarted = 1; } else @@ -721,7 +746,7 @@ void SWFOutputDev::startPage(int pageNum, GfxState *state) void SWFOutputDev::drawLink(Link *link, Catalog *catalog) { - logf(" drawlink\n"); + msg(" drawlink\n"); double x1, y1, x2, y2, w; GfxRGB rgb; swfcoord points[5]; @@ -835,13 +860,13 @@ void SWFOutputDev::drawLink(Link *link, Catalog *catalog) } break; default: { - logf(" Unknown link type!\n"); + msg(" Unknown link type!\n"); break; } } if(!linkinfo && (page || url)) { - logf(" File contains links"); + msg(" File contains links"); linkinfo = 1; } if(page>0) @@ -861,22 +886,22 @@ void SWFOutputDev::drawLink(Link *link, Catalog *catalog) { swfoutput_namedlink(&output, named, points); } - logf(" \"%s\" link to \"%s\" (%d)\n", type, FIXNULL(s), page); + msg(" \"%s\" link to \"%s\" (%d)\n", type, FIXNULL(s), page); } } void SWFOutputDev::saveState(GfxState *state) { - logf(" saveState\n"); + msg(" saveState\n"); updateAll(state); if(clippos<64) clippos ++; else - logf(" Too many nested states in pdf."); + msg(" Too many nested states in pdf."); clipping[clippos] = 0; }; void SWFOutputDev::restoreState(GfxState *state) { - logf(" restoreState\n"); + msg(" restoreState\n"); updateAll(state); while(clipping[clippos]) { swfoutput_endclip(&output); @@ -887,56 +912,31 @@ void SWFOutputDev::restoreState(GfxState *state) { char type3Warning=0; -int SWFOutputDev::searchT1Font(char*name) +char* SWFOutputDev::searchFont(char*name) { int i; - int mapid=-1; char*filename=0; + + msg(" SearchT1Font(%s)", name); + /* see if it is a pdf standard font */ for(i=0;i Loading extra font %s from %s\n", FIXNULL(fontname), - FIXNULL(T1_GetFontFileName(i))); - } - - if(fontname && !strcmp(name, fontname)) { - logf(" Extra font %d, \"%s\" is being used.\n", i, fontname); - return i; - } - fontname = T1_GetFontFileName(i); - if(strrchr(fontname,'/')) - fontname = strrchr(fontname,'/')+1; - - if(strstr(fontname, name)) { - logf(" Extra font %d, \"%s\" is being used.\n", i, fontname); - return i; - } + return fonts[i]; } } - return -1; + return 0; } void SWFOutputDev::updateLineWidth(GfxState *state) @@ -977,112 +977,91 @@ void SWFOutputDev::updateStrokeColor(GfxState *state) char*SWFOutputDev::writeEmbeddedFontToFile(XRef*ref, GfxFont*font) { - char*tmpFileName = NULL; - FILE *f; - int c; - char *fontBuf; - int fontLen; - Type1CFontFile *cvt; - Ref embRef; - Object refObj, strObj; - tmpFileName = "/tmp/tmpfont"; - int ret; - - ret = font->getEmbeddedFontID(&embRef); - if(!ret) { - logf(" Didn't get embedded font id"); - /* not embedded- the caller should now search the font - directories for this font */ - return 0; - } + char*tmpFileName = NULL; + FILE *f; + int c; + char *fontBuf; + int fontLen; + Ref embRef; + Object refObj, strObj; + char namebuf[512]; + tmpFileName = mktmpname(namebuf); + int ret; + + ret = font->getEmbeddedFontID(&embRef); + if(!ret) { + msg(" Didn't get embedded font id"); + /* not embedded- the caller should now search the font + directories for this font */ + return 0; + } - f = fopen(tmpFileName, "wb"); - if (!f) { - logf(" Couldn't create temporary Type 1 font file"); - return 0; + f = fopen(tmpFileName, "wb"); + if (!f) { + msg(" Couldn't create temporary Type 1 font file"); + return 0; + } + if (font->getType() == fontType1C || + font->getType() == fontCIDType0C) { + if (!(fontBuf = font->readEmbFontFile(xref, &fontLen))) { + fclose(f); + msg(" Couldn't read embedded font file"); + return 0; } - if (font->getType() == fontType1C) { - if (!(fontBuf = font->readEmbFontFile(xref, &fontLen))) { - fclose(f); - logf(" Couldn't read embedded font file"); - return 0; - } - cvt = new Type1CFontFile(fontBuf, fontLen); - cvt->convertToType1(f); - delete cvt; - gfree(fontBuf); - } else { - font->getEmbeddedFontID(&embRef); - refObj.initRef(embRef.num, embRef.gen); - refObj.fetch(ref, &strObj); - refObj.free(); - strObj.streamReset(); - int f4[4]; - char f4c[4]; - int t; - for(t=0;t<4;t++) { - f4[t] = strObj.streamGetChar(); - f4c[t] = (char)f4[t]; - if(f4[t] == EOF) - break; - } - if(t==4) { - if(!strncmp(f4c, "true", 4)) { - /* some weird TTF fonts don't start with 0,1,0,0 but with "true". - Change this on the fly */ - f4[0] = f4[2] = f4[3] = 0; - f4[1] = 1; - } - fputc(f4[0], f); - fputc(f4[1], f); - fputc(f4[2], f); - fputc(f4[3], f); - - while ((c = strObj.streamGetChar()) != EOF) { - fputc(c, f); - } - } - strObj.streamClose(); - strObj.free(); + Type1CFontFile *cvt = new Type1CFontFile(fontBuf, fontLen); + cvt->convertToType1(f); + delete cvt; + gfree(fontBuf); + } else if(font->getType() == fontTrueType) { + msg(" writing font using TrueTypeFontFile::writeTTF"); + if (!(fontBuf = font->readEmbFontFile(xref, &fontLen))) { + fclose(f); + msg(" Couldn't read embedded font file"); + return 0; + } + TrueTypeFontFile *cvt = new TrueTypeFontFile(fontBuf, fontLen); + cvt->writeTTF(f); + delete cvt; + gfree(fontBuf); + } else { + font->getEmbeddedFontID(&embRef); + refObj.initRef(embRef.num, embRef.gen); + refObj.fetch(ref, &strObj); + refObj.free(); + strObj.streamReset(); + int f4[4]; + char f4c[4]; + int t; + for(t=0;t<4;t++) { + f4[t] = strObj.streamGetChar(); + f4c[t] = (char)f4[t]; + if(f4[t] == EOF) + break; } - fclose(f); + if(t==4) { + if(!strncmp(f4c, "true", 4)) { + /* some weird TTF fonts don't start with 0,1,0,0 but with "true". + Change this on the fly */ + f4[0] = f4[2] = f4[3] = 0; + f4[1] = 1; + } + fputc(f4[0], f); + fputc(f4[1], f); + fputc(f4[2], f); + fputc(f4[3], f); - if(font->getType() == fontTrueType || - font->getType() == fontCIDType2) - { - if(!ttfinfo) { - logf(" File contains TrueType fonts"); - ttfinfo = 1; + while ((c = strObj.streamGetChar()) != EOF) { + fputc(c, f); } - char name2[80]; - char*tmp; - tmp = strdup(mktmpname((char*)name2)); - sprintf(name2, "%s", tmp); - char*a[] = {"./ttf2pt1","-pttf","-b", tmpFileName, name2}; - logf(" Invoking ttf2pt1..."); - ttf2pt1_main(5,a); - unlink(tmpFileName); - sprintf(name2,"%s.pfb",tmp); - tmpFileName = strdup(name2); } + strObj.streamClose(); + strObj.free(); + } + fclose(f); - return tmpFileName; + return strdup(tmpFileName); } -char* gfxFontName(GfxFont* gfxFont) -{ - GString *gstr; - gstr = gfxFont->getName(); - if(gstr) { - return gstr->getCString(); - } - else { - char buf[32]; - Ref*r=gfxFont->getID(); - sprintf(buf, "UFONT%d", r->num); - return strdup(buf); - } -} char* substitutetarget[256]; char* substitutesource[256]; @@ -1090,110 +1069,20 @@ int substitutepos = 0; char* SWFOutputDev::substituteFont(GfxFont*gfxFont, char* oldname) { -/* ------------------------------ V1 */ - char*fontname = "Times-Roman"; - logf(" substituteFont(,%s)", FIXNULL(oldname)); - this->t1id = searchT1Font(fontname); + msg(" substituteFont(,%s)", FIXNULL(oldname)); + char*filename = searchFont(fontname); if(substitutepos>=sizeof(substitutesource)/sizeof(char*)) { - logf(" Too many fonts in file."); + msg(" Too many fonts in file."); exit(1); } if(oldname) { substitutesource[substitutepos] = oldname; substitutetarget[substitutepos] = fontname; - logf(" substituting %s -> %s", FIXNULL(oldname), FIXNULL(fontname)); + msg(" substituting %s -> %s", FIXNULL(oldname), FIXNULL(fontname)); substitutepos ++; } - return fontname; - -/* ------------------------------ V2 */ - -/* //substitute font - char* fontname = 0; - double m11, m12, m21, m22; - int index; - int code; - double w,w1,w2; - double*fm; - double v; - if(gfxFont->getName()) { - fontname = gfxFont->getName()->getCString(); - } - -// printf("%d %s\n", t, gfxFont->getCharName(t)); - showFontError(gfxFont, 1); - if(1) { //if (!gfxFont->isCIDFont()) { FIXME: xpdf 1.01 does not have is16Bit() - if(gfxFont->isSymbolic()) { - if(fontname && (strstr(fontname,"ing"))) //Dingbats, Wingdings etc. - index = 16; - else - index = 12; - } else if (gfxFont->isFixedWidth()) { - index = 8; - } else if (gfxFont->isSerif()) { - index = 4; - } else { - index = 0; - } - if (gfxFont->isBold() && index!=16) - index += 2; - if (gfxFont->isItalic() && index!=16) - index += 1; - fontname = fontnames[index]; - // get width of 'm' in real font and substituted font - if ((code = gfxFont->getCharCode("m")) >= 0) - w1 = gfxFont->getWidth(code); - else - w1 = 0; - w2 = fontsizes[index]; - if (gfxFont->getType() == fontType3) { - // This is a hack which makes it possible to substitute for some - // Type 3 fonts. The problem is that it's impossible to know what - // the base coordinate system used in the font is without actually - // rendering the font. This code tries to guess by looking at the - // width of the character 'm' (which breaks if the font is a - // subset that doesn't contain 'm'). - if (w1 > 0 && (w1 > 1.1 * w2 || w1 < 0.9 * w2)) { - w1 /= w2; - m11 *= w1; - m12 *= w1; - m21 *= w1; - m22 *= w1; - } - fm = gfxFont->getFontMatrix(); - v = (fm[0] == 0) ? 1 : (fm[3] / fm[0]); - m21 *= v; - m22 *= v; - } else if (!gfxFont->isSymbolic()) { - // if real font is substantially narrower than substituted - // font, reduce the font size accordingly - if (w1 > 0.01 && w1 < 0.9 * w2) { - w1 /= w2; - if (w1 < 0.8) { - w1 = 0.8; - } - m11 *= w1; - m12 *= w1; - m21 *= w1; - m22 *= w1; - } - } - } - if(fontname) { - this->t1id = searchT1Font(fontname); - } - if(substitutepos>=sizeof(substitutesource)/sizeof(char*)) { - logf(" Too many fonts in file."); - exit(1); - } - if(oldname) { - substitutesource[substitutepos] = oldname; - substitutetarget[substitutepos] = fontname; - logf(" substituting %s -> %s", FIXNULL(oldname), FIXNULL(fontname)); - substitutepos ++; - } - return fontname;*/ + return filename; } void unlinkfont(char* filename) @@ -1227,113 +1116,82 @@ void unlinkfont(char* filename) void SWFOutputDev::startDoc(XRef *xref) { - this->xref = xref; + this->xref = xref; } void SWFOutputDev::updateFont(GfxState *state) { - GfxFont*gfxFont = state->getFont(); - char * fileName = 0; + GfxFont*gfxFont = state->getFont(); + + if (!gfxFont) { + return; + } + char * fontname = getFontName(gfxFont); - if (!gfxFont) { - return; - } - char * fontname = gfxFontName(gfxFont); - - int t; - /* first, look if we substituted this font before- - this way, we don't initialize the T1 Fonts - too often */ - for(t=0;t updateFont(%s) [cached]", fontname); + return; + } - if(swfoutput_queryfont(&output, fontname)) - { - swfoutput_setfont(&output, fontname, -1, 0); - return; - } + // look for Type 3 font + if (!type3Warning && gfxFont->getType() == fontType3) { + type3Warning = gTrue; + showFontError(gfxFont, 2); + } - // look for Type 3 font - if (!type3Warning && gfxFont->getType() == fontType3) { - type3Warning = gTrue; - showFontError(gfxFont, 2); - } + /* now either load the font, or find a substitution */ - /* now either load the font, or find a substitution */ + Ref embRef; + GBool embedded = gfxFont->getEmbeddedFontID(&embRef); - Ref embRef; - GBool embedded = gfxFont->getEmbeddedFontID(&embRef); - if(embedded) { - if (gfxFont->getType() == fontType1 || + char*fileName = 0; + int del = 0; + if(embedded && + (gfxFont->getType() == fontType1 || + gfxFont->getType() == fontCIDType0C || gfxFont->getType() == fontType1C || gfxFont->getType() == fontTrueType || - gfxFont->getType() == fontCIDType2) + gfxFont->getType() == fontCIDType2 + )) { - fileName = writeEmbeddedFontToFile(xref, gfxFont); - if(!fileName) { - logf(" Couldn't write font to file"); - showFontError(gfxFont,0); - return ; - } - this->t1id = T1_AddFont(fileName); - if(this->t1id<0) { - logf(" Couldn't load font from file"); - showFontError(gfxFont,0); - unlinkfont(fileName); - return ; - } - } - else { - /* in case the font is embedded, but has an - unsupported format, we just look through the - font directories */ - int newt1id = searchT1Font(fontname); - if(newt1id<0) { - showFontError(gfxFont,0); - fontname = substituteFont(gfxFont, fontname); - } else - this->t1id = newt1id; - } - } else { - if(fontname) { - int newt1id = searchT1Font(fontname); - if(newt1id<0) { - showFontError(gfxFont,1); - fontname = substituteFont(gfxFont, fontname); - } else - this->t1id = newt1id; - } - else { - showFontError(gfxFont,1); - fontname = substituteFont(gfxFont, fontname); + fileName = writeEmbeddedFontToFile(xref, gfxFont); + if(!fileName) showFontError(gfxFont,0); + else del = 1; + } else { + fileName = searchFont(fontname); + if(!fileName) showFontError(gfxFont,0); } - } + if(!fileName) + fileName = substituteFont(gfxFont, fontname); - if(t1id<0) { - showFontError(gfxFont,0); - return; - } - - /* we may have done some substitutions here, so check - again if this font is cached. */ - if(swfoutput_queryfont(&output, fontname)) - { - swfoutput_setfont(&output, fontname, -1, 0); - return; - } + if(!fileName) { + msg(" Couldn't set font %s\n", fontname); + return; + } + + msg(" updateFont(%s) -> %s", fontname, fileName); - logf(" Creating new SWF font: t1id: %d, filename: %s name:%s", this->t1id, FIXNULL(fileName), FIXNULL(fontname)); - swfoutput_setfont(&output, fontname, this->t1id, fileName); - if(fileName) - unlinkfont(fileName); + swfoutput_setfont(&output, fontname, fileName); + + if(fileName && del) + unlinkfont(fileName); } int pic_xids[1024]; @@ -1417,7 +1275,7 @@ void SWFOutputDev::drawGeneralImage(GfxState *state, Object *ref, Stream *str, if(!width || !height || (height<=1 && width<=1)) { - logf(" Ignoring %d by %d image", width, height); + msg(" Ignoring %d by %d image", width, height); unsigned char buf[8]; int x,y; for (y = 0; y < height; ++y) @@ -1435,14 +1293,14 @@ void SWFOutputDev::drawGeneralImage(GfxState *state, Object *ref, Stream *str, if(!pbminfo && !(str->getKind()==strDCT)) { if(!type3active) { - logf(" file contains pbm pictures %s",mask?"(masked)":""); + msg(" file contains pbm pictures %s",mask?"(masked)":""); pbminfo = 1; } if(mask) - logf(" drawing %d by %d masked picture\n", width, height); + msg(" drawing %d by %d masked picture\n", width, height); } if(!jpeginfo && (str->getKind()==strDCT)) { - logf(" file contains jpeg pictures"); + msg(" file contains jpeg pictures"); jpeginfo = 1; } @@ -1649,7 +1507,7 @@ void SWFOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str, int width, int height, GBool invert, GBool inlineImg) { - logf(" drawImageMask %dx%d, invert=%d inline=%d", width, height, invert, inlineImg); + msg(" drawImageMask %dx%d, invert=%d inline=%d", width, height, invert, inlineImg); drawGeneralImage(state,ref,str,width,height,0,invert,inlineImg,1); } @@ -1657,12 +1515,12 @@ void SWFOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, int *maskColors, GBool inlineImg) { - logf(" drawImage %dx%d, %s %s, inline=%d", width, height, + msg(" drawImage %dx%d, %s %s, inline=%d", width, height, colorMap?"colorMap":"no colorMap", maskColors?"maskColors":"no maskColors", inlineImg); if(colorMap) - logf(" colorMap pixcomps:%d bits:%d mode:%d\n", colorMap->getNumPixelComps(), + msg(" colorMap pixcomps:%d bits:%d mode:%d\n", colorMap->getNumPixelComps(), colorMap->getBits(),colorMap->getColorSpace()->getMode()); drawGeneralImage(state,ref,str,width,height,colorMap,0,inlineImg,0); } @@ -1821,6 +1679,11 @@ void pdfswf_setparameter(char*name, char*value) } } +void pdfswf_addfont(char*filename) +{ + fonts[fontnum++] = filename; +} + void pdfswf_drawonlyshapes() { drawonlyshapes = 1; @@ -1902,7 +1765,7 @@ int pdfswf_numpages() int closed=0; void pdfswf_close() { - logf(" pdfswf.cc: pdfswf_close()"); + msg(" pdfswf.cc: pdfswf_close()"); delete output; delete doc; //freeParams();