X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=pdf2swf%2FSWFOutputDev.cc;h=b0472ba053d40fac9dd9c4ef61a290a23b0b154f;hb=c8e0d0bd8cc515f60ab6a1248caf6fdc8945d89e;hp=5d53fbdf8c0c0d5f505c58c540b63ebaa0b51375;hpb=0e916263b32f4920c2f5581caa77985bf1992081;p=swftools.git diff --git a/pdf2swf/SWFOutputDev.cc b/pdf2swf/SWFOutputDev.cc index 5d53fbd..b0472ba 100644 --- a/pdf2swf/SWFOutputDev.cc +++ b/pdf2swf/SWFOutputDev.cc @@ -22,7 +22,10 @@ #include #include #include +#include "../config.h" //xpdf header files +#include "config.h" +#include "gfile.h" #include "GString.h" #include "gmem.h" #include "Object.h" @@ -33,19 +36,20 @@ #include "Catalog.h" #include "Page.h" #include "PDFDoc.h" -#include "Params.h" #include "Error.h" -#include "config.h" #include "OutputDev.h" #include "GfxState.h" #include "GfxFont.h" +#include "CharCodeToUnicode.h" +#include "NameToUnicodeTable.h" #include "FontFile.h" +#include "GlobalParams.h" //swftools header files #include "swfoutput.h" -extern "C" { #include "../lib/log.h" + #include "ttf2pt1.h" -} +#include static PDFDoc*doc = 0; static char* swffilename = 0; @@ -57,6 +61,8 @@ int*pages = 0; int pagebuflen = 0; int pagepos = 0; +double caplinewidth = 3.0; + static void printInfoString(Dict *infoDict, char *key, char *fmt); static void printInfoDate(Dict *infoDict, char *key, char *fmt); @@ -130,9 +136,13 @@ public: // Does this device use drawChar() or drawString()? virtual GBool useDrawChar(); + + virtual GBool interpretType3Chars() {return gTrue;} //----- initialization and control + void startDoc(XRef *xref); + // Start a page. virtual void startPage(int pageNum, GfxState *state) ; @@ -149,6 +159,8 @@ public: virtual void updateFillColor(GfxState *state); virtual void updateStrokeColor(GfxState *state); virtual void updateLineWidth(GfxState *state); + virtual void updateLineJoin(GfxState *state); + virtual void updateLineCap(GfxState *state); virtual void updateAll(GfxState *state) { @@ -156,6 +168,8 @@ public: updateFillColor(state); updateStrokeColor(state); updateLineWidth(state); + updateLineJoin(state); + updateLineCap(state); }; //----- path painting @@ -171,9 +185,9 @@ public: virtual void beginString(GfxState *state, GString *s) ; virtual void endString(GfxState *state) ; virtual void drawChar(GfxState *state, double x, double y, - double dx, double dy, Guchar c) ; - virtual void drawChar16(GfxState *state, double x, double y, - double dx, double dy, int c) ; + double dx, double dy, + double originX, double originY, + CharCode code, Unicode *u, int uLen); //----- image drawing virtual void drawImageMask(GfxState *state, Object *ref, Stream *str, @@ -181,7 +195,11 @@ public: GBool inlineImg); virtual void drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, - GBool inlineImg); + int *maskColors, GBool inlineImg); + + virtual GBool beginType3Char(GfxState *state, + CharCode code, Unicode *u, int uLen); + virtual void endType3Char(GfxState *state); private: void drawGeneralImage(GfxState *state, Object *ref, Stream *str, @@ -190,15 +208,19 @@ public: int clipping[64]; int clippos; + XRef*xref; + int searchT1Font(char*name); char* substituteFont(GfxFont*gfxFont, char*oldname); - char* writeEmbeddedFontToFile(GfxFont*font); + char* writeEmbeddedFontToFile(XRef*ref, GfxFont*font); int t1id; int jpeginfo; // did we write "File contains jpegs" yet? int pbminfo; // did we write "File contains jpegs" yet? int linkinfo; // did we write "File contains links" yet? int ttfinfo; // did we write "File contains TrueType Fonts" yet? + int type3active; // are we between beginType3()/endType3()? + GfxState *laststate; }; @@ -318,75 +340,83 @@ int lastdumppos = 0; */ void showFontError(GfxFont*font, int nr) { - Ref r=font->getID(); + Ref*r=font->getID(); int t; for(t=0;tnum) break; if(t < lastdumppos) return; 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(" This document contains Type 3 Fonts: (some text may be incorrectly displayed)"); + msg(" The following Type 3 Font will be rendered as bitmap:"); dumpFontInfo("", font); } void dumpFontInfo(char*loglevel, GfxFont*font) { GString *gstr; - char*name; + char*name = 0; gstr = font->getName(); - Ref r=font->getID(); - logf("%s=========== %s (ID:%d,%d) ==========\n", loglevel, gstr?gstr->getCString():"(unknown font)", r.num,r.gen); + Ref* r=font->getID(); + msg("%s=========== %s (ID:%d,%d) ==========\n", loglevel, gstr?FIXNULL(gstr->getCString()):"(unknown font)", r->num,r->gen); gstr = font->getTag(); if(gstr) - logf("%sTag: %s\n", loglevel, gstr->getCString()); - if(font->is16Bit()) logf("%sis 16 bit\n", loglevel); + msg("%sTag: %s\n", loglevel, FIXNULL(gstr->getCString())); + + if(font->isCIDFont()) msg("%sis CID font\n", loglevel); GfxFontType type=font->getType(); switch(type) { case fontUnknownType: - logf("%sType: unknown\n",loglevel); - break; - case fontType0: - logf("%sType: 0\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: + msg("%sType: CIDType0\n",loglevel); + break; + case fontCIDType0C: + msg("%sType: CIDType0C\n",loglevel); + break; + case fontCIDType2: + msg("%sType: CIDType2\n",loglevel); break; } Ref embRef; GBool embedded = font->getEmbeddedFontID(&embRef); - name = font->getEmbeddedFontName(); + if(font->getEmbeddedFontName()) + name = font->getEmbeddedFontName()->getCString(); if(embedded) - logf("%sEmbedded name: %s id: %d\n",loglevel, 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, 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");} @@ -398,9 +428,11 @@ SWFOutputDev::SWFOutputDev() ttfinfo = 0; linkinfo = 0; pbminfo = 0; + type3active = 0; clippos = 0; clipping[clippos] = 0; outputstarted = 0; + xref = 0; // printf("SWFOutputDev::SWFOutputDev() \n"); }; @@ -408,10 +440,18 @@ T1_OUTLINE* gfxPath_to_T1_OUTLINE(GfxState*state, GfxPath*path) { int num = path->getNumSubpaths(); int s,t; - bezierpathsegment*start,*last; + bezierpathsegment*start,*last=0; bezierpathsegment*outline = start = new bezierpathsegment(); int cpos = 0; double lastx=0,lasty=0; + if(!num) { + msg(" empty path"); + outline->type = T1_PATHTYPE_MOVE; + outline->dest.x = 0; + outline->dest.y = 0; + outline->link = 0; + return (T1_OUTLINE*)outline; + } for(t = 0; t < num; t++) { GfxSubpath *subpath = path->getSubpath(t); int subnum = subpath->getNumPoints(); @@ -469,18 +509,46 @@ 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 + double miterLimit = state->getMiterLimit(); + double width = state->getTransformedLineWidth(); struct swfmatrix m; + GfxRGB rgb; + double opaq = state->getStrokeOpacity(); + state->getStrokeRGB(&rgb); + 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); - swfoutput_setdrawmode(&output, DRAWMODE_STROKE); - swfoutput_drawpath(&output, outline, &m); + + lineJoin = 1; // other line joins are not yet supported by the swf encoder + // TODO: support bevel joints + + if(((lineCap==1) && (lineJoin==1)) || width<=caplinewidth) { + /* FIXME- if the path is smaller than 2 segments, we could ignore + lineJoin */ + swfoutput_setdrawmode(&output, DRAWMODE_STROKE); + swfoutput_drawpath(&output, outline, &m); + } else { + swfoutput_setfillcolor(&output, (char)(rgb.r*255), (char)(rgb.g*255), + (char)(rgb.b*255), (char)(opaq*255)); + + //swfoutput_setlinewidth(&output, 1.0); //only for debugging + //swfoutput_setstrokecolor(&output, 0, 255, 0, 255); //likewise, see below + //swfoutput_setfillcolor(&output, 255, 0, 0, 255); //likewise, see below + + swfoutput_drawpath2poly(&output, outline, &m, lineJoin, lineCap, width, miterLimit); + updateLineWidth(state); //reset + updateStrokeColor(state); //reset + updateFillColor(state); //reset + } } 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; @@ -491,7 +559,7 @@ void SWFOutputDev::fill(GfxState *state) } 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; @@ -502,7 +570,7 @@ void SWFOutputDev::eoFill(GfxState *state) } void SWFOutputDev::clip(GfxState *state) { - logf(" clip\n"); + msg(" clip\n"); GfxPath * path = state->getPath(); struct swfmatrix m; m.m11 = 1; m.m22 = 1; @@ -514,7 +582,7 @@ void SWFOutputDev::clip(GfxState *state) } 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; @@ -531,63 +599,111 @@ 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(); - swfoutput_setfontmatrix(&output, m11, -m12, m21, -m22); + swfoutput_setfontmatrix(&output, m11, -m21, m12, -m22); } int charcounter = 0; -void SWFOutputDev::drawChar(GfxState *state, double x, double y, double dx, double dy, Guchar c) +void SWFOutputDev::drawChar(GfxState *state, double x, double y, + double dx, double dy, + double originX, double originY, + CharCode c, Unicode *_u, int uLen) { - logf(" drawChar(%f,%f,%f,%f,'%c')\n",x,y,dx,dy,c); + msg(" 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) - { - FontEncoding*enc=state->getFont()->getEncoding(); + if ((state->getRender() & 3) == 3) + return; - double x1,y1; - x1 = x; - y1 = y; - state->transform(x, y, &x1, &y1); + GfxFont*font = state->getFont(); - if(enc->getCharName(c)) - swfoutput_drawchar(&output, x1, y1, enc->getCharName(c), c); - else - logf(" couldn't get name for character %02x from Encoding", c); + if(font->getType() == fontType3) { + /* type 3 chars are passed primarily as graphics */ + return; } -} + double x1,y1; + x1 = x; + y1 = y; + state->transform(x, y, &x1, &y1); + + 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());*/ -void SWFOutputDev::drawChar16(GfxState *state, double x, double y, double dx, double dy, int c) -{ - printf(" drawChar16(%f,%f,%f,%f,%08x)\n",x,y,dx,dy,c); - exit(1); + if(name) + swfoutput_drawchar(&output, x1, y1, name, c); + else + msg(" couldn't get name for CID character %02x from Encoding", c); + } else { + Gfx8BitFont*font8; + font8 = (Gfx8BitFont*)font; + char**enc=font8->getEncoding(); + + if(enc && enc[c]) + swfoutput_drawchar(&output, x1, y1, enc[c], c); + else { + msg(" couldn't get name for character %02x from Encoding", c); + } + } } void SWFOutputDev::endString(GfxState *state) { - logf(" endstring\n"); + msg(" endstring\n"); } + +GBool SWFOutputDev::beginType3Char(GfxState *state, + CharCode code, Unicode *u, int uLen) +{ + msg(" beginType3Char %d, %08x, %d", code, *u, uLen); + type3active = 1; + /* the character itself is going to be passed using + drawImageMask() */ + return gFalse; /* gTrue= is_in_cache? */ +} + +void SWFOutputDev::endType3Char(GfxState *state) +{ + type3active = 0; + msg(" endType3Char"); +} + void SWFOutputDev::startPage(int pageNum, GfxState *state) { double x1,y1,x2,y2; laststate = state; - logf(" startPage %d\n", pageNum); - logf(" processing page %d", pageNum); + msg(" startPage %d\n", pageNum); + msg(" processing page %d", pageNum); state->transform(state->getX1(),state->getY1(),&x1,&y1); state->transform(state->getX2(),state->getY2(),&x2,&y2); @@ -601,6 +717,7 @@ void SWFOutputDev::startPage(int pageNum, GfxState *state) void SWFOutputDev::drawLink(Link *link, Catalog *catalog) { + msg(" drawlink\n"); double x1, y1, x2, y2, w; GfxRGB rgb; swfcoord points[5]; @@ -630,6 +747,7 @@ void SWFOutputDev::drawLink(Link *link, Catalog *catalog) char*s = "-?-"; char*type = "-?-"; char*url = 0; + char*named = 0; int page = -1; switch(action->getKind()) { @@ -664,23 +782,27 @@ void SWFOutputDev::drawLink(Link *link, Catalog *catalog) LinkNamed*l = (LinkNamed*)action; GString*name = l->getName(); if(name) { - s = name->lowerCase()->getCString(); - if(strstr(s, "next") || strstr(s, "forward")) - { - page = currentpage + 1; - } - else if(strstr(s, "prev") || strstr(s, "back")) - { - page = currentpage - 1; - } - else if(strstr(s, "last") || strstr(s, "end")) - { - page = pages[pagepos-1]; //:) - } - else if(strstr(s, "first") || strstr(s, "top")) - { - page = 1; - } + s = name->lowerCase()->getCString(); + named = name->getCString(); + if(!strchr(s,':')) + { + if(strstr(s, "next") || strstr(s, "forward")) + { + page = currentpage + 1; + } + else if(strstr(s, "prev") || strstr(s, "back")) + { + page = currentpage - 1; + } + else if(strstr(s, "last") || strstr(s, "end")) + { + page = pages[pagepos-1]; //:) + } + else if(strstr(s, "first") || strstr(s, "top")) + { + page = 1; + } + } } } break; @@ -709,13 +831,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) @@ -731,22 +853,26 @@ void SWFOutputDev::drawLink(Link *link, Catalog *catalog) { swfoutput_linktourl(&output, url, points); } - logf(" \"%s\" link to \"%s\" (%d)\n", type, s, page); + else if(named) + { + swfoutput_namedlink(&output, named, points); + } + 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); @@ -760,10 +886,9 @@ char type3Warning=0; int SWFOutputDev::searchT1Font(char*name) { int i; - - int id=-1; int mapid=-1; char*filename=0; + for(i=0;i Loading extra font %s from %s\n", FIXNULL(fontname), + FIXNULL(T1_GetFontFileName(i))); + } + + if(fontname && !strcmp(name, fontname)) { + msg(" 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)) { + msg(" Extra font %d, \"%s\" is being used.\n", i, fontname); + return i; + } } } - return id; + return -1; } void SWFOutputDev::updateLineWidth(GfxState *state) @@ -791,6 +941,16 @@ void SWFOutputDev::updateLineWidth(GfxState *state) swfoutput_setlinewidth(&output, width); } +void SWFOutputDev::updateLineCap(GfxState *state) +{ + int c = state->getLineCap(); +} + +void SWFOutputDev::updateLineJoin(GfxState *state) +{ + int j = state->getLineJoin(); +} + void SWFOutputDev::updateFillColor(GfxState *state) { GfxRGB rgb; @@ -811,67 +971,104 @@ void SWFOutputDev::updateStrokeColor(GfxState *state) (char)(rgb.b*255), (char)(opaq*255)); } -char*SWFOutputDev::writeEmbeddedFontToFile(GfxFont*font) +char*SWFOutputDev::writeEmbeddedFontToFile(XRef*ref, GfxFont*font) { char*tmpFileName = NULL; FILE *f; int c; char *fontBuf; int fontLen; - Type1CFontConverter *cvt; + Type1CFontFile *cvt; Ref embRef; Object refObj, strObj; tmpFileName = "/tmp/tmpfont"; - font->getEmbeddedFontID(&embRef); + 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; + msg(" Couldn't create temporary Type 1 font file"); + return 0; } if (font->getType() == fontType1C) { - if (!(fontBuf = font->readEmbFontFile(&fontLen))) { + if (!(fontBuf = font->readEmbFontFile(xref, &fontLen))) { fclose(f); - logf(" Couldn't read embedded font file"); + msg(" Couldn't read embedded font file"); return 0; } - cvt = new Type1CFontConverter(fontBuf, fontLen, f); - cvt->convert(); + cvt = new Type1CFontFile(fontBuf, fontLen); + cvt->convertToType1(f); delete cvt; gfree(fontBuf); } else { font->getEmbeddedFontID(&embRef); refObj.initRef(embRef.num, embRef.gen); - refObj.fetch(&strObj); + refObj.fetch(ref, &strObj); refObj.free(); strObj.streamReset(); - while ((c = strObj.streamGetChar()) != EOF) { - fputc(c, f); + 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(); } fclose(f); - if(font->getType() == fontTrueType) + if(font->getType() == fontTrueType || + font->getType() == fontCIDType2) { if(!ttfinfo) { - logf(" File contains TrueType fonts"); + msg(" File contains TrueType fonts"); ttfinfo = 1; } char name2[80]; - int r1 = lrand48(); - int r2 = lrand48(); - sprintf(name2,"%04x%04x",r1,r2); - char*a[] = {"./ttf2pt1","-pttf","-b", tmpFileName, name2}; - logf(" Invoking ttf2pt1..."); - ttf2pt1_main(5,a); + char*tmp; + tmp = strdup(mktmpname((char*)name2)); + sprintf(name2, "%s", tmp); + char*a[] = {"./ttf2pt1", "-W0", +#ifndef USE_FREETYPE + "-pttf", +#else + "-pft", +#endif + "-b", tmpFileName, name2}; + msg(" Invoking ttf2pt1..."); + ttf2pt1_main(6,a); unlink(tmpFileName); - sprintf(name2,"%04x%04x.pfb",r1,r2); + sprintf(name2,"%s.pfb",tmp); tmpFileName = strdup(name2); } - return tmpFileName; + return tmpFileName; } char* gfxFontName(GfxFont* gfxFont) @@ -883,8 +1080,8 @@ char* gfxFontName(GfxFont* gfxFont) } else { char buf[32]; - Ref r=gfxFont->getID(); - sprintf(buf, "UFONT%d", r.num); + Ref*r=gfxFont->getID(); + sprintf(buf, "UFONT%d", r->num); return strdup(buf); } } @@ -895,7 +1092,26 @@ int substitutepos = 0; char* SWFOutputDev::substituteFont(GfxFont*gfxFont, char* oldname) { - //substitute font +/* ------------------------------ V1 */ + + char*fontname = "Times-Roman"; + msg(" substituteFont(,%s)", FIXNULL(oldname)); + this->t1id = searchT1Font(fontname); + if(substitutepos>=sizeof(substitutesource)/sizeof(char*)) { + msg(" Too many fonts in file."); + exit(1); + } + if(oldname) { + substitutesource[substitutepos] = oldname; + substitutetarget[substitutepos] = 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; @@ -909,7 +1125,7 @@ char* SWFOutputDev::substituteFont(GfxFont*gfxFont, char* oldname) // printf("%d %s\n", t, gfxFont->getCharName(t)); showFontError(gfxFont, 1); - if (!gfxFont->is16Bit()) { + 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; @@ -970,14 +1186,16 @@ char* SWFOutputDev::substituteFont(GfxFont*gfxFont, char* oldname) this->t1id = searchT1Font(fontname); } if(substitutepos>=sizeof(substitutesource)/sizeof(char*)) { - logf(" Too many fonts in file."); + msg(" Too many fonts in file."); exit(1); } - substitutesource[substitutepos] = oldname; - substitutetarget[substitutepos] = fontname; - logf(" substituting %s -> %s", oldname, fontname); - substitutepos ++; - return fontname; + if(oldname) { + substitutesource[substitutepos] = oldname; + substitutetarget[substitutepos] = fontname; + msg(" substituting %s -> %s", FIXNULL(oldname), FIXNULL(fontname)); + substitutepos ++; + } + return fontname;*/ } void unlinkfont(char* filename) @@ -1009,6 +1227,12 @@ void unlinkfont(char* filename) } } +void SWFOutputDev::startDoc(XRef *xref) +{ + this->xref = xref; +} + + void SWFOutputDev::updateFont(GfxState *state) { GfxFont*gfxFont = state->getFont(); @@ -1020,6 +1244,9 @@ void SWFOutputDev::updateFont(GfxState *state) 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", gfxFont); + + /* now either load the font, or find a substitution */ Ref embRef; GBool embedded = gfxFont->getEmbeddedFontID(&embRef); if(embedded) { - if (!gfxFont->is16Bit() && - (gfxFont->getType() == fontType1 || - gfxFont->getType() == fontType1C || - gfxFont->getType() == fontTrueType)) { - - fileName = writeEmbeddedFontToFile(gfxFont); + if (gfxFont->getType() == fontType1 || + gfxFont->getType() == fontType1C || + gfxFont->getType() == fontTrueType || + gfxFont->getType() == fontCIDType2) + { + fileName = writeEmbeddedFontToFile(xref, gfxFont); if(!fileName) { - logf(" Couldn't write font to file"); + msg(" 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"); + msg(" Couldn't load font from file"); showFontError(gfxFont,0); unlinkfont(fileName); return ; } } else { - showFontError(gfxFont,0); - fontname = substituteFont(gfxFont, fontname); + /* 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 + else { + showFontError(gfxFont,1); fontname = substituteFont(gfxFont, fontname); + } } if(t1id<0) { showFontError(gfxFont,0); + return; } /* we may have done some substitutions here, so check @@ -1090,7 +1332,7 @@ void SWFOutputDev::updateFont(GfxState *state) return; } - logf(" Creating new SWF font: t1id: %d, filename: %s name:%s", this->t1id, fileName, fontname); + msg(" 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); @@ -1099,9 +1341,61 @@ void SWFOutputDev::updateFont(GfxState *state) int pic_xids[1024]; int pic_yids[1024]; int pic_ids[1024]; +int pic_width[1024]; +int pic_height[1024]; int picpos = 0; int pic_id = 0; +#define SQR(x) ((x)*(x)) + +unsigned char* antialize(unsigned char*data, int width, int height, int newwidth, int newheight, int palettesize) +{ + if((newwidth<2 || newheight<2) || + (width<=newwidth || height<=newheight)) + return 0; + unsigned char*newdata; + int x,y; + newdata= (unsigned char*)malloc(newwidth*newheight); + int t; + double fx = (double)(width)/newwidth; + double fy = (double)(height)/newheight; + double px = 0; + int blocksize = (int)(8192/(fx*fy)); + int r = 8192*256/palettesize; + for(x=0;xgetNumPixelComps(); + bits = colorMap->getBits(); + } + imgStr = new ImageStream(str, width, ncomps,bits); + imgStr->reset(); + if(!width || !height || (height<=1 && width<=1)) { - logf(" Ignoring %d by %d image", width, height); - int i,j; - if (inlineImg) { - j = height * ((width + 7) / 8); - str->reset(); - for (i = 0; i < j; ++i) { - str->getChar(); - } + msg(" Ignoring %d by %d image", width, height); + unsigned char buf[8]; + int x,y; + for (y = 0; y < height; ++y) + for (x = 0; x < width; ++x) { + imgStr->getPixel(buf); } + delete imgStr; return; } @@ -1132,206 +1435,215 @@ void SWFOutputDev::drawGeneralImage(GfxState *state, Object *ref, Stream *str, state->transform(1, 0, &x3, &y3); state->transform(1, 1, &x4, &y4); - if (str->getKind() == strDCT && - (colorMap->getNumPixelComps() == 3 || !mask) ) - { - sprintf(fileName, "/tmp/tmp%08x.jpg",lrand48()); - logf(" Found jpeg. Temporary storage is %s", fileName); - if(!jpeginfo) - { - logf(" file contains jpeg pictures"); - jpeginfo = 1; - } - if (!(fi = fopen(fileName, "wb"))) { - logf(" Couldn't open temporary image file '%s'", fileName); - return; - } - str = ((DCTStream *)str)->getRawStream(); - str->reset(); - int xid = 0; - int yid = 0; - int count = 0; - while ((c = str->getChar()) != EOF) - { - fputc(c, fi); - xid += count*c; - yid += (~count)*c; - count++; - } - fclose(fi); - - int t,found = -1; - for(t=0;t file contains pbm pictures %s",mask?"(masked)":""); - if(mask) - logf(" drawing %d by %d masked picture\n", width, height); - pbminfo = 1; - } - - if(mask) { - imgStr = new ImageStream(str, width, 1, 1); - imgStr->reset(); - return; - int yes=0,i,j; - unsigned char buf[8]; - int xid = 0; - int yid = 0; - int x,y; - int width2 = (width+3)&(~3); - unsigned char*pic = new unsigned char[width2*height]; - RGBA pal[256]; - GfxRGB rgb; - state->getFillRGB(&rgb); - pal[0].r = (int)(rgb.r*255); pal[0].g = (int)(rgb.g*255); - pal[0].b = (int)(rgb.b*255); pal[0].a = 255; - pal[1].r = 0; pal[1].g = 0; pal[1].b = 0; pal[1].a = 0; - xid += pal[1].r*3 + pal[1].g*11 + pal[1].b*17; - yid += pal[1].r*7 + pal[1].g*5 + pal[1].b*23; - for (y = 0; y < height; ++y) - for (x = 0; x < width; ++x) - { - imgStr->getPixel(buf); - pic[width*y+x] = buf[0]; - xid+=x*buf[0]+1; - yid+=y*buf[0]+1; - } - int t,found = -1; - for(t=0;tgetNumPixelComps(), - colorMap->getBits()); - imgStr->reset(); + if(!pbminfo && !(str->getKind()==strDCT)) { + if(!type3active) { + msg(" file contains pbm pictures %s",mask?"(masked)":""); + pbminfo = 1; + } + if(mask) + msg(" drawing %d by %d masked picture\n", width, height); + } + if(!jpeginfo && (str->getKind()==strDCT)) { + msg(" file contains jpeg pictures"); + jpeginfo = 1; + } - if(colorMap->getNumPixelComps()!=1) - { - RGBA*pic=new RGBA[width*height]; - int xid = 0; - int yid = 0; - for (y = 0; y < height; ++y) { - for (x = 0; x < width; ++x) { - int r,g,b,a; - imgStr->getPixel(pixBuf); - colorMap->getRGB(pixBuf, &rgb); - pic[width*y+x].r = r = (U8)(rgb.r * 255 + 0.5); - pic[width*y+x].g = g = (U8)(rgb.g * 255 + 0.5); - pic[width*y+x].b = b = (U8)(rgb.b * 255 + 0.5); - pic[width*y+x].a = a = 255;//(U8)(rgb.a * 255 + 0.5); - xid += x*r+x*b*3+x*g*7+x*a*11; - yid += y*r*3+y*b*17+y*g*19+y*a*11; + if(mask) { + int yes=0,i,j; + unsigned char buf[8]; + int xid = 0; + int yid = 0; + int x,y; + unsigned char*pic = new unsigned char[width*height]; + RGBA pal[256]; + GfxRGB rgb; + state->getFillRGB(&rgb); + memset(pal,255,sizeof(pal)); + pal[0].r = (int)(rgb.r*255); pal[0].g = (int)(rgb.g*255); + pal[0].b = (int)(rgb.b*255); pal[0].a = 255; + pal[1].r = 0; pal[1].g = 0; pal[1].b = 0; pal[1].a = 0; + int numpalette = 2; + xid += pal[1].r*3 + pal[1].g*11 + pal[1].b*17; + yid += pal[1].r*7 + pal[1].g*5 + pal[1].b*23; + int realwidth = (int)sqrt(SQR(x2-x3) + SQR(y2-y3)); + int realheight = (int)sqrt(SQR(x1-x2) + SQR(y1-y2)); + for (y = 0; y < height; ++y) + for (x = 0; x < width; ++x) + { + imgStr->getPixel(buf); + if(invert) + buf[0]=1-buf[0]; + pic[width*y+x] = buf[0]; + xid+=x*buf[0]+1; + yid+=y*buf[0]*3+1; + } + + /* the size of the drawn image is added to the identifier + as the same image may require different bitmaps if displayed + at different sizes (due to antialiasing): */ + if(type3active) { + xid += realwidth; + yid += realheight; + } + int t,found = -1; + for(t=0;tgetNumPixelComps()!=1 || str->getKind()==strDCT) + { + RGBA*pic=new RGBA[width*height]; + int xid = 0; + int yid = 0; + for (y = 0; y < height; ++y) { + for (x = 0; x < width; ++x) { + int r,g,b,a; + imgStr->getPixel(pixBuf); + colorMap->getRGB(pixBuf, &rgb); + pic[width*y+x].r = r = (U8)(rgb.r * 255 + 0.5); + pic[width*y+x].g = g = (U8)(rgb.g * 255 + 0.5); + pic[width*y+x].b = b = (U8)(rgb.b * 255 + 0.5); + pic[width*y+x].a = a = 255;//(U8)(rgb.a * 255 + 0.5); + xid += x*r+x*b*3+x*g*7+x*a*11; + yid += y*r*3+y*b*17+y*g*19+y*a*11; } - else - { - U8*pic = new U8[width2*height]; - RGBA pal[256]; - int t; - int xid=0,yid=0; - for(t=0;t<256;t++) - { - int r,g,b,a; - pixBuf[0] = t; - colorMap->getRGB(pixBuf, &rgb); - pal[t].r = r = (U8)(rgb.r * 255 + 0.5); - pal[t].g = g = (U8)(rgb.g * 255 + 0.5); - pal[t].b = b = (U8)(rgb.b * 255 + 0.5); - pal[t].a = a = 255;//(U8)(rgb.b * 255 + 0.5); - xid += t*r+t*b*3+t*g*7+t*a*11; - xid += (~t)*r+t*b*3+t*g*7+t*a*11; - } - for (y = 0; y < height; ++y) { - for (x = 0; x < width; ++x) { - imgStr->getPixel(pixBuf); - pic[width2*y+x] = pixBuf[0]; - xid += x*pixBuf[0]*7; - yid += y*pixBuf[0]*3; - } - } - int found = -1; - for(t=0;tgetKind()==strDCT) + pic_ids[picpos] = swfoutput_drawimagejpeg(&output, pic, width, height, + x1,y1,x2,y2,x3,y3,x4,y4); + else + pic_ids[picpos] = swfoutput_drawimagelossless(&output, pic, width, height, + x1,y1,x2,y2,x3,y3,x4,y4); + pic_xids[picpos] = xid; + pic_yids[picpos] = yid; + pic_width[picpos] = width; + pic_height[picpos] = height; + if(picpos<1024) + picpos++; + } else { + swfoutput_drawimageagain(&output, pic_ids[found], width, height, + x1,y1,x2,y2,x3,y3,x4,y4); + } + delete pic; + delete imgStr; + return; + } + else + { + U8*pic = new U8[width*height]; + RGBA pal[256]; + int t; + int xid=0,yid=0; + for(t=0;t<256;t++) + { + int r,g,b,a; + pixBuf[0] = t; + colorMap->getRGB(pixBuf, &rgb); + pal[t].r = r = (U8)(rgb.r * 255 + 0.5); + pal[t].g = g = (U8)(rgb.g * 255 + 0.5); + pal[t].b = b = (U8)(rgb.b * 255 + 0.5); + pal[t].a = a = 255;//(U8)(rgb.b * 255 + 0.5); + xid += t*r+t*b*3+t*g*7+t*a*11; + xid += (~t)*r+t*b*3+t*g*7+t*a*11; + } + for (y = 0; y < height; ++y) { + for (x = 0; x < width; ++x) { + imgStr->getPixel(pixBuf); + pic[width*y+x] = pixBuf[0]; + xid += x*pixBuf[0]*7; + yid += y*pixBuf[0]*3; } - delete imgStr; - } - + } + int found = -1; + for(t=0;t drawImageMask %dx%d, invert=%d inline=%d", width, height, invert, inlineImg); drawGeneralImage(state,ref,str,width,height,0,invert,inlineImg,1); } void SWFOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, - int width, int height, - GfxImageColorMap *colorMap, GBool inlineImg) + int width, int height, GfxImageColorMap *colorMap, + int *maskColors, GBool inlineImg) { + msg(" drawImage %dx%d, %s %s, inline=%d", width, height, + colorMap?"colorMap":"no colorMap", + maskColors?"maskColors":"no maskColors", + inlineImg); + if(colorMap) + 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); } @@ -1398,14 +1718,11 @@ void pdfswf_init(char*filename, char*userPassword) GString *fileName = new GString(filename); GString *userPW; Object info; - // init error file - errorInit(); // read config file - initParams(xpdfConfigFile); + globalParams = new GlobalParams(""); // open PDF file - xref = NULL; if (userPassword && userPassword[0]) { userPW = new GString(userPassword); } else { @@ -1421,7 +1738,8 @@ void pdfswf_init(char*filename, char*userPassword) // print doc info doc->getDocInfo(&info); - if (info.isDict()) { + if (info.isDict() && + (screenloglevel>=LOGLEVEL_NOTICE)) { printInfoString(info.getDict(), "Title", "Title: %s\n"); printInfoString(info.getDict(), "Subject", "Subject: %s\n"); printInfoString(info.getDict(), "Keywords", "Keywords: %s\n"); @@ -1430,24 +1748,23 @@ void pdfswf_init(char*filename, char*userPassword) printInfoString(info.getDict(), "Producer", "Producer: %s\n"); printInfoDate(info.getDict(), "CreationDate", "CreationDate: %s\n"); printInfoDate(info.getDict(), "ModDate", "ModDate: %s\n"); + printf("Pages: %d\n", doc->getNumPages()); + printf("Linearized: %s\n", doc->isLinearized() ? "yes" : "no"); + printf("Encrypted: "); + if (doc->isEncrypted()) { + printf("yes (print:%s copy:%s change:%s addNotes:%s)\n", + doc->okToPrint() ? "yes" : "no", + doc->okToCopy() ? "yes" : "no", + doc->okToChange() ? "yes" : "no", + doc->okToAddNotes() ? "yes" : "no"); + } else { + printf("no\n"); + } } info.free(); - // print page count - printf("Pages: %d\n", doc->getNumPages()); numpages = doc->getNumPages(); - - // print linearization info - printf("Linearized: %s\n", doc->isLinearized() ? "yes" : "no"); - - // print encryption info - printf("Encrypted: "); if (doc->isEncrypted()) { - printf("yes (print:%s copy:%s change:%s addNotes:%s)\n", - doc->okToPrint() ? "yes" : "no", - doc->okToCopy() ? "yes" : "no", - doc->okToChange() ? "yes" : "no", - doc->okToAddNotes() ? "yes" : "no"); /*ERROR: This pdf is encrypted, and disallows copying. Due to the DMCA, paragraph 1201, (2) A-C, circumventing a technological measure that efficively controls access to @@ -1460,13 +1777,50 @@ void pdfswf_init(char*filename, char*userPassword) } if(!doc->okToChange() || !doc->okToAddNotes()) swfoutput_setprotected(); - } - else { - printf("no\n"); } - output = new SWFOutputDev(); + output->startDoc(doc->getXRef()); +} + +void pdfswf_setparameter(char*name, char*value) +{ + if(!strcmp(name, "drawonlyshapes")) { + drawonlyshapes = atoi(value); + } else if(!strcmp(name, "ignoredraworder")) { + ignoredraworder = atoi(value); + } else if(!strcmp(name, "linksopennewwindow")) { + opennewwindow = atoi(value); + } else if(!strcmp(name, "storeallcharacters")) { + storeallcharacters = atoi(value); + } else if(!strcmp(name, "enablezlib")) { + enablezlib = atoi(value); + } else if(!strcmp(name, "insertstop")) { + insertstoptag = atoi(value); + } else if(!strcmp(name, "flashversion")) { + flashversion = atoi(value); + } else if(!strcmp(name, "jpegquality")) { + int val = atoi(value); + if(val<0) val=0; + if(val>100) val=100; + jpegquality = val; + } else if(!strcmp(name, "outputfilename")) { + swffilename = value; + } else if(!strcmp(name, "caplinewidth")) { + caplinewidth = atof(value); + } else if(!strcmp(name, "splinequality")) { + int v = atoi(value); + v = 500-(v*5); // 100% = 0.25 pixel, 0% = 25 pixel + if(v<1) v = 1; + splinemaxerror = v; + } else if(!strcmp(name, "fontquality")) { + int v = atoi(value); + v = 500-(v*5); // 100% = 0.25 pixel, 0% = 25 pixel + if(v<1) v = 1; + fontsplinemaxerror = v; + } else { + fprintf(stderr, "unknown parameter: %s (=%s)\n", name, value); + } } void pdfswf_drawonlyshapes() @@ -1489,6 +1843,11 @@ void pdfswf_storeallcharacters() storeallcharacters = 1; } +void pdfswf_enablezlib() +{ + enablezlib = 1; +} + void pdfswf_jpegquality(int val) { if(val<0) val=0; @@ -1501,6 +1860,16 @@ void pdfswf_setoutputfilename(char*_filename) swffilename = _filename; } +void pdfswf_insertstop() +{ + insertstoptag = 1; +} + +void pdfswf_setversion(int n) +{ + flashversion = n; +} + void pdfswf_convertpage(int page) { @@ -1524,7 +1893,7 @@ void pdfswf_performconversion() for(t=0;tdisplayPage((OutputDev*)output, currentpage, /*zoom*/100, /*rotate*/0, /*doLinks*/(int)1); + doc->displayPage((OutputDev*)output, currentpage, /*dpi*/72, /*rotate*/0, /*doLinks*/(int)1); } } @@ -1532,16 +1901,16 @@ int pdfswf_numpages() { return doc->getNumPages(); } - int closed=0; void pdfswf_close() { - logf(" pdfswf.cc: pdfswf_close()"); + msg(" pdfswf.cc: pdfswf_close()"); delete output; delete doc; - freeParams(); + //freeParams(); // check for memory leaks Object::memCheck(stderr); gMemReport(stderr); } +