X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=pdf2swf%2FSWFOutputDev.cc;h=f0533fa08af72d2ff5e10a1cf765aad3db73cbbc;hp=8f8b81b0f7ed4b3946a1ac2e4bc7370184b8a671;hb=16a1056ad5c25f12f7c9b291fcc78dd1f594671c;hpb=124cab4510bc4c34492521f342b231f093a00dd5 diff --git a/pdf2swf/SWFOutputDev.cc b/pdf2swf/SWFOutputDev.cc index 8f8b81b..f0533fa 100644 --- a/pdf2swf/SWFOutputDev.cc +++ b/pdf2swf/SWFOutputDev.cc @@ -48,6 +48,10 @@ extern "C" { #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; @@ -132,10 +136,12 @@ public: // Does this device use drawChar() or drawString()? virtual GBool useDrawChar(); - virtual GBool interpretType3Chars() {return gFalse;} + virtual GBool interpretType3Chars() {return gTrue;} //----- initialization and control + void startDoc(XRef *xref); + // Start a page. virtual void startPage(int pageNum, GfxState *state) ; @@ -174,9 +180,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, @@ -184,7 +190,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, @@ -193,15 +203,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; }; @@ -335,7 +349,7 @@ void showFontError(GfxFont*font, int nr) else if(nr == 1) logf(" The following font caused problems (substituting):"); else if(nr == 2) - logf(" This document contains Type 3 Fonts: (some text may be incorrectly displayed)"); + logf(" The following Type 3 Font will be rendered as bitmap:"); dumpFontInfo("", font); } @@ -351,7 +365,7 @@ void dumpFontInfo(char*loglevel, GfxFont*font) if(gstr) logf("%sTag: %s\n", loglevel, FIXNULL(gstr->getCString())); - //if(font->is16Bit()) logf("%sis 16 bit\n", loglevel); //FIXME: not existing in xpdf 1.01 + if(font->isCIDFont()) logf("%sis CID font\n", loglevel); GfxFontType type=font->getType(); switch(type) { @@ -409,9 +423,11 @@ SWFOutputDev::SWFOutputDev() ttfinfo = 0; linkinfo = 0; pbminfo = 0; + type3active = 0; clippos = 0; clipping[clippos] = 0; outputstarted = 0; + xref = 0; // printf("SWFOutputDev::SWFOutputDev() \n"); }; @@ -562,7 +578,11 @@ void SWFOutputDev::beginString(GfxState *state, GString *s) } int charcounter = 0; -void SWFOutputDev::drawChar(GfxState *state, double x, double y, double dx, double dy, Guchar c) +int ciderror = 0; +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); // check for invisible text -- this is used by Acrobat Capture @@ -571,7 +591,13 @@ void SWFOutputDev::drawChar(GfxState *state, double x, double y, double dx, doub GfxFont*font = state->getFont(); Gfx8BitFont*font8; if(font->isCIDFont()) { - logf(" CID Font\n"); + if(!ciderror) + logf(" Not drawing CID Font characters!"); + ciderror++; + return; + } + if(font->getType() == fontType3) { + /* type 3 chars are passed primarily as graphics */ return; } font8 = (Gfx8BitFont*)font; @@ -590,17 +616,28 @@ void SWFOutputDev::drawChar(GfxState *state, double x, double y, double dx, doub } } -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); -} - void SWFOutputDev::endString(GfxState *state) { logf(" endstring\n"); } + +GBool SWFOutputDev::beginType3Char(GfxState *state, + CharCode code, Unicode *u, int uLen) +{ + logf(" 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; + logf(" endType3Char"); +} + void SWFOutputDev::startPage(int pageNum, GfxState *state) { double x1,y1,x2,y2; @@ -788,6 +825,11 @@ int SWFOutputDev::searchT1Font(char*name) int i; int mapid=-1; char*filename=0; + + char*name2 = 0; + if(name) name2 = strchr(name,'+'); + if(name2) name2++; + 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 %s is being used.\n", fontname); - return i; + + if(fontname) { + if((!strcmp(name, fontname)) || + (name2 && !strcmp(name2, fontname))) + { + logf(" Extra font %s is being used.\n", fontname); + return i; + } } fontname = T1_GetFontFileName(i); if(strrchr(fontname,'/')) fontname = strrchr(fontname,'/')+1; - if(strstr(fontname, name)) { + if(strstr(fontname, name) || (name2 && strstr(fontname,name2))) { logf(" Extra font %s is being used.\n", fontname); return i; } @@ -859,38 +906,45 @@ 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; + 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) { + /* 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; + 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"); 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) { @@ -919,9 +973,7 @@ char*SWFOutputDev::writeEmbeddedFontToFile(GfxFont*font) tmpFileName = strdup(name2); } - return tmpFileName;*/ - - return 0; + return tmpFileName; } char* gfxFontName(GfxFont* gfxFont) @@ -945,7 +997,24 @@ int substitutepos = 0; char* SWFOutputDev::substituteFont(GfxFont*gfxFont, char* oldname) { - return "Times-Roman"; +/* ------------------------------ V1 */ + + char*fontname = "Times-Roman"; + 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; + +/* ------------------------------ V2 */ + /* //substitute font char* fontname = 0; double m11, m12, m21, m22; @@ -960,7 +1029,7 @@ char* SWFOutputDev::substituteFont(GfxFont*gfxFont, char* oldname) // printf("%d %s\n", t, gfxFont->getCharName(t)); showFontError(gfxFont, 1); - if(1) { //if (!gfxFont->is16Bit()) { FIXME: xpdf 1.01 does not have 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; @@ -1062,6 +1131,12 @@ void unlinkfont(char* filename) } } +void SWFOutputDev::startDoc(XRef *xref) +{ + this->xref = xref; +} + + void SWFOutputDev::updateFont(GfxState *state) { GfxFont*gfxFont = state->getFont(); @@ -1073,6 +1148,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() && FIXME: not in xpdf 1.01 + if (!gfxFont->isCIDFont() && (gfxFont->getType() == fontType1 || gfxFont->getType() == fontType1C || gfxFont->getType() == fontTrueType)) { - fileName = writeEmbeddedFontToFile(gfxFont); + fileName = writeEmbeddedFontToFile(xref, gfxFont); if(!fileName) { logf(" Couldn't write font to file"); showFontError(gfxFont,0); @@ -1116,8 +1198,12 @@ void SWFOutputDev::updateFont(GfxState *state) } } else { - showFontError(gfxFont,0); - fontname = substituteFont(gfxFont, fontname); + int newt1id = searchT1Font(fontname); + if(newt1id<0) { + showFontError(gfxFont,0); + fontname = substituteFont(gfxFont, fontname); + } else + this->t1id = newt1id; } } else { if(fontname) { @@ -1153,9 +1239,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;xtransform(1, 1, &x4, &y4); if(!pbminfo && !(str->getKind()==strDCT)) { - logf(" file contains pbm pictures %s",mask?"(masked)":""); + if(!type3active) { + logf(" file contains pbm pictures %s",mask?"(masked)":""); + pbminfo = 1; + } if(mask) logf(" drawing %d by %d masked picture\n", width, height); - pbminfo = 1; } if(!jpeginfo && (str->getKind()==strDCT)) { logf(" file contains jpeg pictures"); @@ -1212,38 +1352,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 drawImage %dx%d, %s, inline=%d", width, height, - colorMap?"colorMap":"no colorMap", inlineImg); + logf(" 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(), colorMap->getBits(),colorMap->getColorSpace()->getMode()); @@ -1422,8 +1616,6 @@ void pdfswf_init(char*filename, char*userPassword) GString *fileName = new GString(filename); GString *userPW; Object info; - // init error file - //errorInit(); FIXME xpdf 1.01 // read config file globalParams = new GlobalParams(""); @@ -1444,7 +1636,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"); @@ -1453,24 +1646,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 @@ -1483,13 +1675,10 @@ 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_drawonlyshapes() @@ -1561,6 +1750,11 @@ int pdfswf_numpages() return doc->getNumPages(); } +void pdfswf_insertstop() +{ + insertstoptag = 1; +} + int closed=0; void pdfswf_close() { @@ -1573,3 +1767,4 @@ void pdfswf_close() gMemReport(stderr); } +