X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Fpdf%2FGFXOutputDev.cc;h=5439923170986f54ee4a2c2edf8b238d01a8c186;hp=59492715374bc9d315b1c5281001e8205a455ada;hb=HEAD;hpb=8aeee6106e6d04d3ced2afff12c238eb38254123 diff --git a/lib/pdf/GFXOutputDev.cc b/lib/pdf/GFXOutputDev.cc index 5949271..5439923 100644 --- a/lib/pdf/GFXOutputDev.cc +++ b/lib/pdf/GFXOutputDev.cc @@ -105,6 +105,7 @@ struct fontentry { char*pfb; int pfblen; char*fullfilename; + DisplayFontParam *dfp; } pdf2t1map[] ={ {"Times-Roman", "n021003l", n021003l_afm, n021003l_afm_len, n021003l_pfb, n021003l_pfb_len}, {"Times-Italic", "n021023l", n021023l_afm, n021023l_afm_len, n021023l_pfb, n021023l_pfb_len}, @@ -371,6 +372,11 @@ static char fc_ismatch(FcPattern*match, char*family, char*style) } #endif +static inline char islowercase(char c) +{ + return (c>='a' && c<='z'); +} + char* fontconfig_searchForFont(char*name) { #ifdef HAVE_FONTCONFIG @@ -448,16 +454,18 @@ char* fontconfig_searchForFont(char*name) int t; int p; for(p=0;p<2;p++) { - for(t=0;tnfont;t++) { - char*fcfamily=0,*fcstyle=0,*filename=0; - FcBool scalable=FcFalse, outline=FcFalse; - FcPatternGetString(set->fonts[t], "family", 0, (FcChar8**)&fcfamily); - FcPatternGetString(set->fonts[t], "style", 0, (FcChar8**)&fcstyle); - FcPatternGetString(set->fonts[t], "file", 0, (FcChar8**)&filename); - FcPatternGetBool(set->fonts[t], "outline", 0, &outline); - FcPatternGetBool(set->fonts[t], "scalable", 0, &scalable); - if(scalable && outline) { - msg(" %s (%s) -> %s", fcfamily, fcstyle, filename); + if(set) { + for(t=0;tnfont;t++) { + char*fcfamily=0,*fcstyle=0,*filename=0; + FcBool scalable=FcFalse, outline=FcFalse; + FcPatternGetString(set->fonts[t], "family", 0, (FcChar8**)&fcfamily); + FcPatternGetString(set->fonts[t], "style", 0, (FcChar8**)&fcstyle); + FcPatternGetString(set->fonts[t], "file", 0, (FcChar8**)&filename); + FcPatternGetBool(set->fonts[t], "outline", 0, &outline); + FcPatternGetBool(set->fonts[t], "scalable", 0, &scalable); + if(scalable && outline) { + msg(" %s (%s) -> %s", fcfamily, fcstyle, filename); + } } } set = FcConfigGetFonts(config, FcSetApplication); @@ -466,20 +474,36 @@ char* fontconfig_searchForFont(char*name) } char*family = strdup(name); - char*style = 0; - char*dash = strchr(family, '-'); - if(!dash) dash = strchr(family, ','); + int len = strlen(family); + char*styles[] = {"Medium", "Regular", "Bold", "Italic", "Black", "Narrow"}; + char*style = 0; + int t; + for(t=0;tl+1 && !strcmp(family+len-l, styles[t]) && islowercase(family[len-l-1])) { + style = styles[t]; + family[len-l]=0; + break; + } + } + if(!style) { + char*dash = strchr(family, '-'); + if(!dash) dash = strchr(family, ','); + if(dash) { + *dash = 0; + style = dash+1; + } + } FcPattern*pattern = 0; - if(dash) { - *dash = 0; - style = dash+1; + if(style) { msg(" FontConfig: Looking for font %s (family=%s style=%s)", name, family, style); pattern = FcPatternBuild(NULL, FC_OUTLINE, FcTypeBool, FcTrue, FC_SCALABLE, FcTypeBool, FcTrue, FC_FAMILY, FcTypeString, family, FC_STYLE, FcTypeString, style, NULL); } else { msg(" FontConfig: Looking for font %s (family=%s)", name, family); pattern = FcPatternBuild(NULL, FC_OUTLINE, FcTypeBool, FcTrue, FC_SCALABLE, FcTypeBool, FcTrue, FC_FAMILY, FcTypeString, family, NULL); } + pattern = FcPatternBuild(NULL, FC_OUTLINE, FcTypeBool, FcTrue, FC_SCALABLE, FcTypeBool, FcTrue, FC_FAMILY, FcTypeString, family, NULL); FcResult result; FcConfigSubstitute(0, pattern, FcMatchPattern); @@ -541,10 +565,11 @@ DisplayFontParam *GFXGlobalParams::getDisplayFont(GString *fontName) } else { msg(" Storing standard PDF font %s at %s", name, pdf2t1map[t].fullfilename); } + DisplayFontParam *dfp = new DisplayFontParam(new GString(fontName), displayFontT1); + dfp->t1.fileName = new GString(pdf2t1map[t].fullfilename); + pdf2t1map[t].dfp = dfp; } - DisplayFontParam *dfp = new DisplayFontParam(new GString(fontName), displayFontT1); - dfp->t1.fileName = new GString(pdf2t1map[t].fullfilename); - return dfp; + return pdf2t1map[t].dfp; } } @@ -625,6 +650,7 @@ GFXOutputDev::GFXOutputDev(InfoOutputDev*info, PDFDoc*doc) this->config_drawonlyshapes = 0; this->config_disable_polygon_conversion = 0; this->config_multiply = 1; + this->config_detectspaces = 1; this->config_linkdatafile = 0; this->page2page = 0; this->num_pages = 0; @@ -642,12 +668,16 @@ void GFXOutputDev::setParameter(const char*key, const char*value) this->config_transparent = atoi(value); } else if(!strcmp(key,"drawonlyshapes")) { this->config_drawonlyshapes = atoi(value); + } else if(!strcmp(key,"detectspaces")) { + this->config_detectspaces = atoi(value); } else if(!strcmp(key,"extrafontdata")) { this->config_extrafontdata = atoi(value); } else if(!strcmp(key,"linkdatafile")) { 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) @@ -971,6 +1001,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; @@ -994,7 +1026,8 @@ GBool GFXOutputDev::radialShadedFill(GfxState *state, GfxRadialShading *shading) colToByte(color2.c[0]), colToByte(color2.c[1]), colToByte(color2.c[2])); infofeature("radial shaded fills"); - gfxgradient_t*g = (gfxgradient_t*)malloc(sizeof(gfxgradient_t)*3); + gfxgradient_t gr[3]; + gfxgradient_t*g = &gr[0]; g[0].next = &g[1]; g[1].next = &g[2]; g[2].next = 0; @@ -1028,6 +1061,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); @@ -1443,14 +1478,14 @@ void GFXOutputDev::drawChar(GfxState *state, double x, double y, this->transformXY(state, x-originX, y-originY, &m.tx, &m.ty); //m.tx += originX; m.ty += originY; - msg(" drawChar(%f,%f,c='%c' (%d), u=%d <%d>) CID=%d render=%d glyphid=%d font=%08x",m.tx,m.ty,(charid&127)>=32?charid:'?', charid, u, uLen, font->isCIDFont(), render, glyphid, current_gfxfont); + msg(" drawChar(%f,%f,c='%c' (%d), u=%d <%d>) CID=%d render=%d glyphid=%d font=%p",m.tx,m.ty,(charid&127)>=32?charid:'?', charid, u, uLen, font->isCIDFont(), render, glyphid, current_gfxfont); if((render == RENDER_FILL && !config_drawonlyshapes) || (render == RENDER_FILLSTROKE && state->getTransformedLineWidth()<1.0) || (render == RENDER_INVISIBLE)) { int space = this->current_fontinfo->space_char; - if(config_extrafontdata && space>=0 && m.m00 && !m.m01) { + if(config_extrafontdata && config_detectspaces && space>=0 && m.m00 && !m.m01) { /* space char detection */ if(last_char_gfxfont == current_gfxfont && last_char_y == m.ty && @@ -1504,7 +1539,7 @@ void GFXOutputDev::drawChar(GfxState *state, double x, double y, void GFXOutputDev::endString(GfxState *state) { int render = state->getRender(); - msg(" endString() render=%d textstroke=%08x", render, current_text_stroke); + msg(" endString() render=%d textstroke=%p", render, current_text_stroke); if(current_text_stroke) { /* fillstroke and stroke text rendering objects we can process right @@ -1533,7 +1568,7 @@ void GFXOutputDev::endString(GfxState *state) void GFXOutputDev::endTextObject(GfxState *state) { int render = state->getRender(); - msg(" endTextObject() render=%d textstroke=%08x clipstroke=%08x", render, current_text_stroke, current_text_clip); + msg(" endTextObject() render=%d textstroke=%p clipstroke=%p", render, current_text_stroke, current_text_clip); if(current_text_clip) { device->setparameter(device, "mark","TXT"); @@ -1597,7 +1632,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; @@ -1606,6 +1641,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); @@ -1616,8 +1652,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 saveState %08x", state); + msg(" saveState %p", state); updateAll(state); if(statepos>=64) { msg(" Too many nested states in pdf."); @@ -1886,13 +1922,13 @@ void GFXOutputDev::saveState(GfxState *state) { }; void GFXOutputDev::restoreState(GfxState *state) { - dbgindent-=2; dbg("restoreState %08x", state); + dbgindent-=2; dbg("restoreState %p", state); if(statepos==0) { msg(" Invalid restoreState"); exit(1); } - msg(" restoreState %08x%s%s", state, + msg(" restoreState %p%s%s", state, states[statepos].softmask?" (end softmask)":"", states[statepos].clipping?" (end clipping)":""); if(states[statepos].softmask) { @@ -1917,7 +1953,7 @@ void GFXOutputDev::restoreState(GfxState *state) { if(verbose) { int t; for(t=0;t<=statepos;t++) { - printf("%08x ", states[t].state); + printf("%p ", states[t].state); } printf("\n"); } @@ -2046,8 +2082,6 @@ void GFXOutputDev::updateFont(GfxState *state) device->addfont(device, current_gfxfont); free(id); - device->addfont(device, current_gfxfont); - updateFontMatrix(state); } @@ -2417,8 +2451,8 @@ void GFXOutputDev::drawGeneralImage(GfxState *state, Object *ref, Stream *str, } else { msg(" resampling %dx%d to mask size (%dx%d)", width, height, maskWidth, maskHeight); gfxcolor_t*newpic=new gfxcolor_t[maskWidth*maskHeight]; - double dx = width / maskWidth; - double dy = height / maskHeight; + double dx = width / (double)maskWidth; + double dy = height / (double)maskHeight; double yy = 0; for(y = 0; y < maskHeight; y++) { double xx = 0; @@ -2448,6 +2482,10 @@ void GFXOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str, int width, int height, GBool invert, GBool inlineImg) { + if(config_textonly) { + OutputDev::drawImageMask(state,ref,str,width,height,invert,inlineImg); + return; + } dbg("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, 0, 0,0,0,0, 0); @@ -2457,6 +2495,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", @@ -2477,6 +2519,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); @@ -2496,6 +2542,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); @@ -2505,11 +2555,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(); @@ -2520,6 +2572,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); @@ -2536,6 +2590,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); @@ -2651,7 +2707,7 @@ void GFXOutputDev::beginTransparencyGroup(GfxState *state, double *bbox, if(blendingColorSpace) { colormodename = GfxColorSpace::getColorSpaceModeName(blendingColorSpace->getMode()); } - dbg("beginTransparencyGroup device=%08x %.1f/%.1f/%.1f/%.1f %s isolated=%d knockout=%d forsoftmask=%d", device, bbox[0],bbox[1],bbox[2],bbox[3], colormodename, isolated, knockout, forSoftMask); + dbg("beginTransparencyGroup device=%p %.1f/%.1f/%.1f/%.1f %s isolated=%d knockout=%d forsoftmask=%d", device, bbox[0],bbox[1],bbox[2],bbox[3], colormodename, isolated, knockout, forSoftMask); msg(" beginTransparencyGroup %.1f/%.1f/%.1f/%.1f %s isolated=%d knockout=%d forsoftmask=%d", bbox[0],bbox[1],bbox[2],bbox[3], colormodename, isolated, knockout, forSoftMask); //states[statepos].createsoftmask |= forSoftMask; @@ -2661,9 +2717,9 @@ void GFXOutputDev::beginTransparencyGroup(GfxState *state, double *bbox, states[statepos].olddevice = this->device; this->device = (gfxdevice_t*)rfx_calloc(sizeof(gfxdevice_t)); - dbg("this->device now %08x (old: %08x)", this->device, states[statepos].olddevice); + dbg("this->device now %p (old: %p)", this->device, states[statepos].olddevice); - gfxdevice_record_init(this->device); + gfxdevice_record_init(this->device, 0); /*if(!forSoftMask) { ////??? state->setFillOpacity(0.0); @@ -2676,7 +2732,7 @@ void GFXOutputDev::endTransparencyGroup(GfxState *state) dbgindent-=2; gfxdevice_t*r = this->device; - dbg("endTransparencyGroup this->device now back to %08x (destroying %08x)", states[statepos].olddevice, this->device); + dbg("endTransparencyGroup this->device now back to %p (destroying %p)", states[statepos].olddevice, this->device); this->device = states[statepos].olddevice; if(!this->device) { @@ -2686,8 +2742,8 @@ void GFXOutputDev::endTransparencyGroup(GfxState *state) gfxresult_t*recording = r->finish(r); - dbg(" forsoftmask=%d recording=%08x/%08x", states[statepos].createsoftmask, r, recording); - msg(" endTransparencyGroup forsoftmask=%d recording=%08x/%08x", states[statepos].createsoftmask, r, recording); + dbg(" forsoftmask=%d recording=%p/%p", states[statepos].createsoftmask, r, recording); + msg(" endTransparencyGroup forsoftmask=%d recording=%p/%p", states[statepos].createsoftmask, r, recording); if(states[statepos].createsoftmask) { states[statepos-1].softmaskrecording = recording; @@ -2706,7 +2762,7 @@ void GFXOutputDev::paintTransparencyGroup(GfxState *state, double *bbox) "colordodge","colorburn","hardlight","softlight","difference", "exclusion","hue","saturation","color","luminosity"}; - dbg("paintTransparencyGroup blend=%s softmaskon=%d recording=%08x", blendmodes[state->getBlendMode()], states[statepos].softmask, states[statepos].grouprecording); + dbg("paintTransparencyGroup blend=%s softmaskon=%d recording=%p", blendmodes[state->getBlendMode()], states[statepos].softmask, states[statepos].grouprecording); msg(" paintTransparencyGroup blend=%s softmaskon=%d", blendmodes[state->getBlendMode()], states[statepos].softmask); if(state->getBlendMode() == gfxBlendNormal) @@ -2725,9 +2781,9 @@ void GFXOutputDev::paintTransparencyGroup(GfxState *state, double *bbox) if(blendmode == gfxBlendMultiply && alpha>200) alpha = 128; gfxdevice_t ops; - dbg("this->device=%08x, this->device->name=%s\n", this->device, this->device->name); + dbg("this->device=%p, this->device->name=%s\n", this->device, this->device->name); gfxdevice_ops_init(&ops, this->device, alpha); - gfxresult_record_replay(grouprecording, &ops); + gfxresult_record_replay(grouprecording, &ops, 0); ops.finish(&ops); } grouprecording->destroy(grouprecording); @@ -2760,9 +2816,9 @@ void GFXOutputDev::setSoftMask(GfxState *state, double *bbox, GBool alpha, Funct } states[statepos].olddevice = this->device; this->device = (gfxdevice_t*)rfx_calloc(sizeof(gfxdevice_t)); - gfxdevice_record_init(this->device); + gfxdevice_record_init(this->device, 0); - dbg("softmaskrecording is %08x (dev=%08x) at statepos %d\n", states[statepos].softmaskrecording, this->device, statepos); + dbg("softmaskrecording is %p (dev=%p) at statepos %d\n", states[statepos].softmaskrecording, this->device, statepos); states[statepos].softmask = 1; states[statepos].softmask_alpha = alpha; @@ -2799,15 +2855,15 @@ void GFXOutputDev::clearSoftMask(GfxState *state) /* get outline of all objects below the soft mask */ gfxdevice_t uniondev; gfxdevice_union_init(&uniondev, 0); - gfxresult_record_replay(below, &uniondev); + gfxresult_record_replay(below, &uniondev, 0); gfxline_t*belowoutline = gfxdevice_union_getunion(&uniondev); uniondev.finish(&uniondev); gfxbbox_t bbox = gfxline_getbbox(belowoutline); gfxline_free(belowoutline);belowoutline=0; #if 0 this->device->startclip(this->device, belowoutline); - gfxresult_record_replay(below, this->device); - gfxresult_record_replay(mask, this->device); + gfxresult_record_replay(below, this->device, 0); + gfxresult_record_replay(mask, this->device, 0); this->device->endclip(this->device); #endif @@ -2822,16 +2878,16 @@ void GFXOutputDev::clearSoftMask(GfxState *state) } belowrender.setparameter(&belowrender, "antialize", "2"); belowrender.startpage(&belowrender, width, height); - gfxresult_record_replay(below, &belowrender); + gfxresult_record_replay(below, &belowrender, 0); 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); maskrender.startpage(&maskrender, width, height); - gfxresult_record_replay(mask, &maskrender); + gfxresult_record_replay(mask, &maskrender, 0); maskrender.endpage(&maskrender); gfxresult_t* maskresult = maskrender.finish(&maskrender); gfximage_t* maskimg = (gfximage_t*)maskresult->get(maskresult,"page0"); @@ -2871,7 +2927,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);