X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=pdf2swf%2FSWFOutputDev.cc;h=9dd6f8e0bee8f5aafd749844bea7ea34b1447b34;hb=46cd627d647e910f814be6f746517f05ba6faca7;hp=5c21a98f55afce13638838040a01f61447a4faba;hpb=a4d5d87844a72f61db923cffdd654dc05d5cc066;p=swftools.git diff --git a/pdf2swf/SWFOutputDev.cc b/pdf2swf/SWFOutputDev.cc index 5c21a98..9dd6f8e 100644 --- a/pdf2swf/SWFOutputDev.cc +++ b/pdf2swf/SWFOutputDev.cc @@ -22,7 +22,9 @@ #include #include #include +#include "../config.h" //xpdf header files +#include "config.h" #include "gfile.h" #include "GString.h" #include "gmem.h" @@ -35,18 +37,19 @@ #include "Page.h" #include "PDFDoc.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; @@ -58,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); @@ -132,7 +137,7 @@ public: // Does this device use drawChar() or drawString()? virtual GBool useDrawChar(); - virtual GBool interpretType3Chars() {return gFalse;} + virtual GBool interpretType3Chars() {return gTrue;} //----- initialization and control @@ -154,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) { @@ -161,6 +168,8 @@ public: updateFillColor(state); updateStrokeColor(state); updateLineWidth(state); + updateLineJoin(state); + updateLineCap(state); }; //----- path painting @@ -187,6 +196,10 @@ public: virtual void drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, 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, @@ -206,6 +219,8 @@ public: 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; }; @@ -335,11 +350,11 @@ 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(" 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); } @@ -349,39 +364,39 @@ void dumpFontInfo(char*loglevel, GfxFont*font) char*name = 0; gstr = font->getName(); 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, gstr?FIXNULL(gstr->getCString()):"(unknown font)", r->num,r->gen); gstr = font->getTag(); if(gstr) - logf("%sTag: %s\n", loglevel, FIXNULL(gstr->getCString())); + msg("%sTag: %s\n", loglevel, FIXNULL(gstr->getCString())); - 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; } @@ -390,18 +405,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");} @@ -413,6 +428,7 @@ SWFOutputDev::SWFOutputDev() ttfinfo = 0; linkinfo = 0; pbminfo = 0; + type3active = 0; clippos = 0; clipping[clippos] = 0; outputstarted = 0; @@ -428,6 +444,14 @@ T1_OUTLINE* gfxPath_to_T1_OUTLINE(GfxState*state, GfxPath*path) 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(); @@ -485,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; @@ -507,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; @@ -518,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; @@ -530,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; @@ -547,19 +599,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(); @@ -570,49 +622,95 @@ int charcounter = 0; void SWFOutputDev::drawChar(GfxState *state, double x, double y, double dx, double dy, double originX, double originY, - CharCode c, Unicode *u, int uLen) + 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) - { - GfxFont*font = state->getFont(); - Gfx8BitFont*font8; - if(font->isCIDFont()) { - logf(" CID Font"); - return; - } - font8 = (Gfx8BitFont*)font; - - char**enc=font8->getEncoding(); - - double x1,y1; - x1 = x; - y1 = y; - state->transform(x, y, &x1, &y1); - - if(enc[c]) - swfoutput_drawchar(&output, x1, y1, enc[c], c); - else - logf(" couldn't get name for character %02x from Encoding", c); + if ((state->getRender() & 3) == 3) + return; + + GfxFont*font = state->getFont(); + + 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());*/ + + if(name) + swfoutput_drawchar(&output, x1, y1, name, c); + else + msg(" couldn't get name for CID character %02x from Encoding", c); + swfoutput_drawchar(&output, x1, y1, "", 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); + swfoutput_drawchar(&output, x1, y1, "", 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); if(!outputstarted) { + msg(" Bounding box is (%f,%f)-(%f,%f)", x1,y1,x2,y2); swfoutput_init(&output, swffilename, abs((int)(x2-x1)),abs((int)(y2-y1))); outputstarted = 1; } @@ -622,7 +720,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]; @@ -687,24 +785,27 @@ void SWFOutputDev::drawLink(Link *link, Catalog *catalog) LinkNamed*l = (LinkNamed*)action; GString*name = l->getName(); if(name) { - s = name->lowerCase()->getCString(); - named = name->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; @@ -733,13 +834,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) @@ -759,22 +860,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); @@ -790,6 +891,9 @@ int SWFOutputDev::searchT1Font(char*name) int i; int mapid=-1; char*filename=0; + + msg(" SearchT1Font(%s)", name); + for(i=0;i Loading extra font %s from %s\n", FIXNULL(fontname), + msg(" Loading extra font %s from %s\n", FIXNULL(fontname), FIXNULL(T1_GetFontFileName(i))); } + if(fontname && !strcmp(name, fontname)) { - logf(" Extra font %s is being used.\n", fontname); + msg(" Extra font %d, \"%s\" is being used.\n", i, fontname); return i; } fontname = T1_GetFontFileName(i); @@ -827,7 +932,7 @@ int SWFOutputDev::searchT1Font(char*name) fontname = strrchr(fontname,'/')+1; if(strstr(fontname, name)) { - logf(" Extra font %s is being used.\n", fontname); + msg(" Extra font %d, \"%s\" is being used.\n", i, fontname); return i; } } @@ -841,6 +946,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; @@ -876,6 +991,7 @@ char*SWFOutputDev::writeEmbeddedFontToFile(XRef*ref, GfxFont*font) 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; @@ -883,13 +999,13 @@ char*SWFOutputDev::writeEmbeddedFontToFile(XRef*ref, GfxFont*font) f = fopen(tmpFileName, "wb"); if (!f) { - logf(" Couldn't create temporary Type 1 font file"); + msg(" Couldn't create temporary Type 1 font file"); return 0; } if (font->getType() == fontType1C) { 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 Type1CFontFile(fontBuf, fontLen); @@ -902,27 +1018,56 @@ char*SWFOutputDev::writeEmbeddedFontToFile(XRef*ref, GfxFont*font) 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]; 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); + 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,"%s.pfb",tmp); tmpFileName = strdup(name2); @@ -955,15 +1100,16 @@ char* SWFOutputDev::substituteFont(GfxFont*gfxFont, char* oldname) /* ------------------------------ V1 */ char*fontname = "Times-Roman"; + msg(" substituteFont(,%s)", FIXNULL(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); } 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; @@ -1045,13 +1191,13 @@ 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); } 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;*/ @@ -1133,39 +1279,49 @@ void SWFOutputDev::updateFont(GfxState *state) Ref embRef; GBool embedded = gfxFont->getEmbeddedFontID(&embRef); if(embedded) { - if (!gfxFont->isCIDFont() && - (gfxFont->getType() == fontType1 || - gfxFont->getType() == fontType1C || - gfxFont->getType() == fontTrueType)) { - + 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) { @@ -1181,7 +1337,7 @@ void SWFOutputDev::updateFont(GfxState *state) return; } - logf(" Creating new SWF font: t1id: %d, filename: %s name:%s", this->t1id, FIXNULL(fileName), FIXNULL(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); @@ -1190,9 +1346,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;x 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) @@ -1233,13 +1441,15 @@ void SWFOutputDev::drawGeneralImage(GfxState *state, Object *ref, Stream *str, state->transform(1, 1, &x4, &y4); if(!pbminfo && !(str->getKind()==strDCT)) { - logf(" file contains pbm pictures %s",mask?"(masked)":""); + if(!type3active) { + msg(" file contains pbm pictures %s",mask?"(masked)":""); + pbminfo = 1; + } if(mask) - logf(" drawing %d by %d masked picture\n", width, height); - pbminfo = 1; + 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; } @@ -1249,38 +1459,86 @@ void SWFOutputDev::drawGeneralImage(GfxState *state, Object *ref, Stream *str, int xid = 0; int yid = 0; int x,y; - int width2 = (width+3)&(~3); - unsigned char*pic = new unsigned char[width2*height]; + 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]=255-buf[0]? + if(invert) + buf[0]=1-buf[0]; pic[width*y+x] = buf[0]; xid+=x*buf[0]+1; - yid+=y*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;t 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); } @@ -1402,12 +1664,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); } @@ -1481,7 +1743,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"); @@ -1490,24 +1753,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 @@ -1520,13 +1782,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() @@ -1566,6 +1865,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) { @@ -1597,11 +1906,10 @@ 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(); @@ -1610,3 +1918,4 @@ void pdfswf_close() gMemReport(stderr); } +