X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fpdf%2FGFXOutputDev.cc;h=ff875aa35d4ce760d29389fa531cf29408870963;hb=cce10b37d5db502e4612ddfa5d7b14d41814445b;hp=13f70877cc5e3f2450fce79a1bdcb64a3cad2be7;hpb=9e1987ca321def20b6f756bb5955d41c78c45c05;p=swftools.git diff --git a/lib/pdf/GFXOutputDev.cc b/lib/pdf/GFXOutputDev.cc index 13f7087..ff875aa 100644 --- a/lib/pdf/GFXOutputDev.cc +++ b/lib/pdf/GFXOutputDev.cc @@ -36,15 +36,20 @@ #ifdef HAVE_FONTCONFIG #include #endif + +#include "../../config.h" + //xpdf header files -#include "config.h" -#ifdef HAVE_POPPLER -#include -#include +#include "popplercompat.h" + #ifdef HAVE_POPPLER + #include + #include #else -#include "gfile.h" -#include "GString.h" + #include "xpdf/config.h" + #include "gfile.h" + #include "GString.h" #endif + #include "Object.h" #include "Stream.h" #include "Array.h" @@ -676,6 +681,8 @@ void GFXOutputDev::setParameter(const char*key, const char*value) this->config_linkdatafile = strdup(value); } else if(!strcmp(key,"convertgradients")) { this->config_convertgradients = atoi(value); + } else if(!strcmp(key,"textonly")) { + this->config_textonly = atoi(value); } else if(!strcmp(key,"multiply")) { this->config_multiply = atoi(value); if(this->config_multiply<1) @@ -960,23 +967,21 @@ void GFXOutputDev::transformXY(GfxState*state, double x, double y, double*nx, do *ny += user_movey + clipmovey; } - -#if (xpdfMajorVersion*10000 + xpdfMinorVersion*100 + xpdfUpdateVersion) < 30207 -void GFXOutputDev::tilingPatternFill(GfxState *state, Object *str, - int paintType, Dict *resDict, - double *mat, double *bbox, - int x0, int y0, int x1, int y1, - double xStep, double yStep) -#else -void GFXOutputDev::tilingPatternFill(GfxState *state, Gfx *gfx, Object *str, +POPPLER_TILING_PATERN_RETURN GFXOutputDev::tilingPatternFill(GfxState *state, + POPPLER_TILING_PATERN_GFX + Object *str, int paintType, Dict *resDict, double *mat, double *bbox, int x0, int y0, int x1, int y1, double xStep, double yStep) -#endif { msg(" tilingPatternFill"); infofeature("tiling pattern fills"); +#ifdef HAVE_POPPLER + // since we don't implement this method yet, + // reduce it to a series of other drawing operations. + return gFalse; +#endif } GBool GFXOutputDev::functionShadedFill(GfxState *state, GfxFunctionShading *shading) @@ -999,6 +1004,8 @@ static gfxcolor_t col2col(GfxColorSpace*colspace, GfxColor* col) GBool GFXOutputDev::radialShadedFill(GfxState *state, GfxRadialShading *shading) { + if(config_textonly) {return gTrue;} + double x0,y0,r0,x1,y1,x2,y2,x9,y9,r1; shading->getCoords(&x0,&y0,&r0,&x9,&y9,&r1); x1=x0+r1;y1=y0; @@ -1057,6 +1064,8 @@ GBool GFXOutputDev::radialShadedFill(GfxState *state, GfxRadialShading *shading) GBool GFXOutputDev::axialShadedFill(GfxState *state, GfxAxialShading *shading) { + if(config_textonly) {return gTrue;} + double x0,y0,x1,y1; shading->getCoords(&x0,&y0,&x1,&y1); this->transformXY(state, x0,y0,&x0,&y0); @@ -1626,7 +1635,7 @@ void GFXOutputDev::endType3Char(GfxState *state) msg(" endType3Char"); } -void GFXOutputDev::startPage(int pageNum, GfxState *state, double crop_x1, double crop_y1, double crop_x2, double crop_y2) +void GFXOutputDev::startPage(int pageNum, GfxState *state) { this->currentpage = pageNum; double x1,y1,x2,y2; @@ -1635,6 +1644,7 @@ void GFXOutputDev::startPage(int pageNum, GfxState *state, double crop_x1, doubl gfxcolor_t black = {255,0,0,0}; laststate = state; gfxline_t clippath[5]; + PDFRectangle *r = this->page->getCropBox(); /* state->transform(state->getX1(),state->getY1(),&x1,&y1); state->transform(state->getX2(),state->getY2(),&x2,&y2); @@ -1645,8 +1655,8 @@ void GFXOutputDev::startPage(int pageNum, GfxState *state, double crop_x1, doubl y1 = crop_y1; x2 = crop_x2; y2 = crop_y2;*/ - state->transform(crop_x1,crop_y1,&x1,&y1); //x1 += user_movex; y1 += user_movey; - state->transform(crop_x2,crop_y2,&x2,&y2); //x2 += user_movex; y2 += user_movey; + state->transform(r->x1,r->y1,&x1,&y1); //x1 += user_movex; y1 += user_movey; + state->transform(r->x2,r->y2,&x2,&y2); //x2 += user_movex; y2 += user_movey; if(x2 drawImageMask %dx%d, invert=%d inline=%d", width, height, invert, inlineImg); drawGeneralImage(state,ref,str,width,height,0,invert,inlineImg,1, 0, 0,0,0,0, 0); @@ -2484,6 +2498,10 @@ void GFXOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, int *maskColors, GBool inlineImg) { + if(config_textonly) { + OutputDev::drawImage(state,ref,str,width,height,colorMap,maskColors,inlineImg); + return; + } dbg("drawImage %dx%d, %s, %s, inline=%d", width, height, colorMap?"colorMap":"no colorMap", maskColors?"maskColors":"no maskColors", @@ -2504,6 +2522,10 @@ void GFXOutputDev::drawMaskedImage(GfxState *state, Object *ref, Stream *str, Stream *maskStr, int maskWidth, int maskHeight, GBool maskInvert) { + if(config_textonly) { + OutputDev::drawMaskedImage(state,ref,str,width,height,colorMap,maskStr,maskWidth,maskHeight,maskInvert); + return; + } dbg("drawMaskedImage %dx%d, %s, %dx%d mask", width, height, colorMap?"colorMap":"no colorMap", maskWidth, maskHeight); @@ -2523,6 +2545,10 @@ void GFXOutputDev::drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str int maskWidth, int maskHeight, GfxImageColorMap *maskColorMap) { + if(config_textonly) { + OutputDev::drawSoftMaskedImage(state,ref,str,width,height,colorMap,maskStr,maskWidth,maskHeight,maskColorMap); + return; + } dbg("drawSoftMaskedImage %dx%d, %s, %dx%d mask", width, height, colorMap?"colorMap":"no colorMap", maskWidth, maskHeight); @@ -2532,11 +2558,13 @@ void GFXOutputDev::drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str if(colorMap) msg(" colorMap pixcomps:%d bits:%d mode:%d", colorMap->getNumPixelComps(), colorMap->getBits(),colorMap->getColorSpace()->getMode()); - drawGeneralImage(state,ref,str,width,height,colorMap,0,0,0,0, maskStr, maskWidth, maskHeight, 0, maskColorMap); } + void GFXOutputDev::stroke(GfxState *state) { + if(config_textonly) {return;} + dbg("stroke"); GfxPath * path = state->getPath(); @@ -2547,6 +2575,8 @@ void GFXOutputDev::stroke(GfxState *state) void GFXOutputDev::fill(GfxState *state) { + if(config_textonly) {return;} + gfxcolor_t col = getFillColor(state); dbg("fill %02x%02x%02x%02x",col.r,col.g,col.b,col.a); @@ -2563,6 +2593,8 @@ void GFXOutputDev::fill(GfxState *state) void GFXOutputDev::eoFill(GfxState *state) { + if(config_textonly) {return;} + gfxcolor_t col = getFillColor(state); dbg("eofill %02x%02x%02x%02x",col.r,col.g,col.b,col.a); @@ -2608,6 +2640,9 @@ void addGlobalFont(const char*filename) void addGlobalLanguageDir(const char*dir) { +#ifdef HAVE_POPPLER + msg(" NOT adding %s to language pack directories (not implemented with poppler)", dir); +#else msg(" Adding %s to language pack directories", dir); FILE*fi = 0; @@ -2623,6 +2658,7 @@ void addGlobalLanguageDir(const char*dir) } globalParams->parseFile(new GString(config_file), fi); fclose(fi); +#endif } void addGlobalFontDir(const char*dirname) @@ -2853,7 +2889,7 @@ void GFXOutputDev::clearSoftMask(GfxState *state) belowrender.endpage(&belowrender); gfxresult_t* belowresult = belowrender.finish(&belowrender); gfximage_t* belowimg = (gfximage_t*)belowresult->get(belowresult,"page0"); - //writePNG("below.png", (unsigned char*)belowimg->data, belowimg->width, belowimg->height); + //png_write("below.png", (unsigned char*)belowimg->data, belowimg->width, belowimg->height); gfxdevice_t maskrender; gfxdevice_render_init(&maskrender); @@ -2898,7 +2934,9 @@ void GFXOutputDev::clearSoftMask(GfxState *state) matrix.m00 = 1.0; matrix.m10 = 0.0; matrix.tx = 0.0; matrix.m01 = 0.0; matrix.m11 = 1.0; matrix.ty = 0.0; - this->device->fillbitmap(this->device, line, belowimg, &matrix, 0); + if(!config_textonly) { + this->device->fillbitmap(this->device, line, belowimg, &matrix, 0); + } mask->destroy(mask); below->destroy(below);