X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=pdf2swf%2FSWFOutputDev.cc;h=51f051a376a1a55568e08d30dd3f1066d4118470;hb=3444147e3d6aac2ead138ed70932f24ac2dd549e;hp=bc0fadf655169298846548ea73542c8f33bd9f11;hpb=ce609b2766561441e5d59f31a48957330eeea932;p=swftools.git diff --git a/pdf2swf/SWFOutputDev.cc b/pdf2swf/SWFOutputDev.cc index bc0fadf..51f051a 100644 --- a/pdf2swf/SWFOutputDev.cc +++ b/pdf2swf/SWFOutputDev.cc @@ -217,11 +217,16 @@ public: GBool inlineImg); private: + void drawGeneralImage(GfxState *state, Object *ref, Stream *str, + int width, int height, GfxImageColorMap*colorMap, GBool invert, + GBool inlineImg, int mask); int clipping[32]; int clippos; int setT1Font(char*name,FontEncoding*enc); int t1id; + int jpeginfo; // did we write "Page contains jpegs" yet? + int pbminfo; // did we write "Page contains jpegs" yet? }; char mybuf[1024]; @@ -350,13 +355,13 @@ void showFontError(GfxFont*font, int nr) if(lastdumppos The following font caused problems:"); + logf(" The following font caused problems:"); else if(nr == 1) - logf(" The following font caused problems (substituting):"); + 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(" This document contains Type 3 Fonts: (some text may be incorrectly displayed)"); - dumpFontInfo("", font); + dumpFontInfo("", font); } void dumpFontInfo(char*loglevel, GfxFont*font) @@ -417,6 +422,8 @@ void dumpFontInfo(char*loglevel, GfxFont*font) SWFOutputDev::SWFOutputDev() { + jpeginfo = 0; + pbminfo = 0; clippos = 0; clipping[clippos] = 0; outputstarted = 0; @@ -488,55 +495,56 @@ T1_OUTLINE* gfxPath_to_T1_OUTLINE(GfxState*state, GfxPath*path) void SWFOutputDev::stroke(GfxState *state) { - logf(" %s stroke\n",gfxstate2str(state)); + logf(" stroke\n"); GfxPath * path = state->getPath(); struct swfmatrix m; m.m11 = 1; m.m21 = 0; m.m22 = 1; - m.m21 = 0; m.m13 = 0; m.m23 = 0; + 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); } void SWFOutputDev::fill(GfxState *state) { - logf(" %s fill\n",gfxstate2str(state)); + logf(" fill\n"); GfxPath * path = state->getPath(); struct swfmatrix m; m.m11 = 1; m.m21 = 0; m.m22 = 1; - m.m21 = 0; m.m13 = 0; m.m23 = 0; + m.m12 = 0; m.m13 = 0; m.m23 = 0; T1_OUTLINE*outline = gfxPath_to_T1_OUTLINE(state, path); swfoutput_setdrawmode(&output, DRAWMODE_FILL); swfoutput_drawpath(&output, outline, &m); } void SWFOutputDev::eoFill(GfxState *state) { - logf(" %s eofill\n",gfxstate2str(state)); + logf(" eofill\n"); GfxPath * path = state->getPath(); struct swfmatrix m; m.m11 = 1; m.m21 = 0; m.m22 = 1; - m.m21 = 0; m.m13 = 0; m.m23 = 0; + m.m12 = 0; m.m13 = 0; m.m23 = 0; T1_OUTLINE*outline = gfxPath_to_T1_OUTLINE(state, path); swfoutput_setdrawmode(&output, DRAWMODE_EOFILL); swfoutput_drawpath(&output, outline, &m); } void SWFOutputDev::clip(GfxState *state) { - logf(" %s clip\n",gfxstate2str(state)); + logf(" clip\n"); GfxPath * path = state->getPath(); struct swfmatrix m; - m.m11 = 1; m.m21 = 0; m.m22 = 1; - m.m21 = 0; m.m13 = 0; m.m23 = 0; + 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); swfoutput_startclip(&output, outline, &m); clipping[clippos] = 1; } void SWFOutputDev::eoClip(GfxState *state) { - logf(" %s eoclip\n",gfxstate2str(state)); + logf(" eoclip\n"); GfxPath * path = state->getPath(); struct swfmatrix m; m.m11 = 1; m.m21 = 0; m.m22 = 1; - m.m21 = 0; m.m13 = 0; m.m23 = 0; + m.m12 = 0; m.m13 = 0; m.m23 = 0; T1_OUTLINE*outline = gfxPath_to_T1_OUTLINE(state, path); swfoutput_startclip(&output, outline, &m); clipping[clippos] = 1; @@ -561,7 +569,7 @@ GBool SWFOutputDev::useDrawChar() void SWFOutputDev::beginString(GfxState *state, GString *s) { double m11,m21,m12,m22; - logf(" %s beginstring \"%s\"\n", gfxstate2str(state), s->getCString()); + logf(" beginstring \"%s\"\n", s->getCString()); state->getFontTransMat(&m11, &m12, &m21, &m22); m11 *= state->getHorizScaling(); m21 *= state->getHorizScaling(); @@ -571,7 +579,7 @@ 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) { - logf(" %s drawChar(%f,%f,%f,%f,'%c')\n",gfxstate2str(state), x,y,dx,dy,c); + 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) { @@ -588,19 +596,19 @@ 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(" %s drawChar16(%f,%f,%f,%f,%08x)\n",gfxstate2str(state), x,y,dx,dy,c); + printf(" drawChar16(%f,%f,%f,%f,%08x)\n",x,y,dx,dy,c); exit(1); } void SWFOutputDev::endString(GfxState *state) { - logf(" %s endstring\n", gfxstate2str(state)); + logf(" endstring\n"); } void SWFOutputDev::startPage(int pageNum, GfxState *state) { double x1,y1,x2,y2; - logf(" %s, startPage %d\n", gfxstate2str(state), pageNum); + logf(" startPage %d\n", pageNum); logf(" processing page %d", pageNum); state->transform(state->getX1(),state->getY1(),&x1,&y1); @@ -681,14 +689,14 @@ void SWFOutputDev::drawLink(Link *link, Catalog *catalog) } void SWFOutputDev::saveState(GfxState *state) { - logf(" %s saveState\n", gfxstate2str(state)); + logf(" saveState\n"); updateAll(state); clippos ++; clipping[clippos] = 0; }; void SWFOutputDev::restoreState(GfxState *state) { - logf(" %s restoreState\n", gfxstate2str(state)); + logf(" restoreState\n"); updateAll(state); if(clipping[clippos]) swfoutput_endclip(&output); @@ -765,7 +773,7 @@ char*writeEmbeddedFontToFile(GfxFont*font) Type1CFontConverter *cvt; Ref embRef; Object refObj, strObj; - tmpFileName = "tmpfont"; + tmpFileName = "/tmp/tmpfont"; font->getEmbeddedFontID(&embRef); f = fopen(tmpFileName, "wb"); @@ -936,21 +944,33 @@ void SWFOutputDev::updateFont(GfxState *state) unlink(fileName); } -void SWFOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str, - int width, int height, GBool invert, - GBool inlineImg) { +void SWFOutputDev::drawGeneralImage(GfxState *state, Object *ref, Stream *str, + int width, int height, GfxImageColorMap*colorMap, GBool invert, + GBool inlineImg, int mask) +{ FILE *fi; int c; char fileName[128]; double x1,y1,x2,y2,x3,y3,x4,y4; + ImageStream *imgStr; + Guchar pixBuf[4]; + GfxRGB rgb; + state->transform(0, 1, &x1, &y1); state->transform(0, 0, &x2, &y2); state->transform(1, 0, &x3, &y3); state->transform(1, 1, &x4, &y4); - if (str->getKind() == strDCT) { + if (str->getKind() == strDCT && + (colorMap->getNumPixelComps() == 3 || !mask) ) + { sprintf(fileName, "/tmp/tmp%08x.jpg",lrand48()); - logf(" Found picture. Temporary storage is %s", fileName); + 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; @@ -960,43 +980,93 @@ void SWFOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str, while ((c = str->getChar()) != EOF) fputc(c, fi); fclose(fi); - swfoutput_drawimagefile(&output, fileName, width, height, x1,y1,x2,y2,x3,y3,x4,y4); + swfoutput_drawimagejpeg(&output, fileName, width, height, x1,y1,x2,y2,x3,y3,x4,y4); unlink(fileName); } else { - logf(" File contains pbm pictures."); + + if(!pbminfo) { + logf(" file contains pbm pictures %s",mask?"(masked)":""); + if(mask) + logf(" ignoring %d by %d masked picture\n", width, height); + pbminfo = 1; + } + + if(mask) { + str->reset(); + int yes=0; + while ((c = str->getChar()) != EOF) + { + if((c<32 || c>'z') && yes && (c!=13) && (c!=10)) { + printf("no ascii: %02x\n", c); + yes = 1; + } + } + } else { + int x,y; + int width2 = (width+3)&(~3); + imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), + colorMap->getBits()); + imgStr->reset(); + + if(colorMap->getNumPixelComps()!=1) + { + RGBA*pic=new RGBA[width*height]; + for (y = 0; y < height; ++y) { + for (x = 0; x < width; ++x) { + imgStr->getPixel(pixBuf); + colorMap->getRGB(pixBuf, &rgb); + pic[width*y+x].r = (U8)(rgb.r * 255 + 0.5); + pic[width*y+x].g = (U8)(rgb.g * 255 + 0.5); + pic[width*y+x].b = (U8)(rgb.b * 255 + 0.5); + pic[width*y+x].a = 255;//(U8)(rgb.a * 255 + 0.5); + } + } + swfoutput_drawimagelossless(&output, pic, width, height, + x1,y1,x2,y2,x3,y3,x4,y4); + delete pic; + } + else + { + U8*pic = new U8[width2*height]; + RGBA pal[256]; + int t; + for(t=0;t<256;t++) + { + pixBuf[0] = t; + colorMap->getRGB(pixBuf, &rgb); + pal[t].r = (U8)(rgb.r * 255 + 0.5); + pal[t].g = (U8)(rgb.g * 255 + 0.5); + pal[t].b = (U8)(rgb.b * 255 + 0.5); + pal[t].a = 255;//(U8)(rgb.b * 255 + 0.5); + } + for (y = 0; y < height; ++y) { + for (x = 0; x < width; ++x) { + imgStr->getPixel(pixBuf); + pic[width2*y+x] = pixBuf[0]; + } + } + swfoutput_drawimagelossless256(&output, pic, pal, width, height, + x1,y1,x2,y2,x3,y3,x4,y4); + delete pic; + } + delete imgStr; + } + } } +void SWFOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str, + int width, int height, GBool invert, + GBool 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) { - FILE *fi; - int c; - char fileName[128]; - double x1,y1,x2,y2,x3,y3,x4,y4; - state->transform(0, 1, &x1, &y1); - state->transform(0, 0, &x2, &y2); - state->transform(1, 0, &x3, &y3); - state->transform(1, 1, &x4, &y4); - - if (str->getKind() == strDCT && - colorMap->getNumPixelComps() == 3) { - sprintf(fileName, "/tmp/tmp%08x.jpg", lrand48()); - logf(" Found picture. Temporary storage is %s", fileName); - if (!(fi = fopen(fileName, "wb"))) { - error(-1, "Couldn't open temporary image file '%s'", fileName); - return; - } - str = ((DCTStream *)str)->getRawStream(); - str->reset(); - while ((c = str->getChar()) != EOF) - fputc(c, fi); - fclose(fi); - swfoutput_drawimagefile(&output, fileName, width, height, x1,y1,x2,y2,x3,y3,x4,y4); - unlink(fileName); - } else { - logf(" File contains pbm pictures."); - } + GfxImageColorMap *colorMap, GBool inlineImg) +{ + drawGeneralImage(state,ref,str,width,height,colorMap,0,inlineImg,0); } PDFDoc*doc = 0; @@ -1077,6 +1147,23 @@ void pdfswf_init(char*filename, char*userPassword) output = new SWFOutputDev(); } +void pdfswf_drawonlyshapes() +{ + drawonlyshapes = 1; +} + +void pdfswf_ignoredraworder() +{ + ignoredraworder = 1; +} + +void pdfswf_jpegquality(int val) +{ + if(val<0) val=0; + if(val>100) val=100; + jpegquality = val; +} + void pdfswf_setoutputfilename(char*_filename) { swffilename = _filename; @@ -1092,11 +1179,12 @@ int pdfswf_numpages() return doc->getNumPages(); } +int closed=0; void pdfswf_close() { - delete doc; + logf(" pdfswf.cc: pdfswf_close()"); delete output; - + delete doc; freeParams(); // check for memory leaks Object::memCheck(stderr);