X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Fpdf%2FGFXOutputDev.cc;h=635d10d5c3c2f9d2e5ea4641bddbe7e980f8b900;hp=b450e546cb84c23a6a155da6088c07634697cfc2;hb=4454f6b665f2f14d0107a0144be947d95a252f8e;hpb=2391d7ae5d8a145a250a8b80ab8c93ba74eba030 diff --git a/lib/pdf/GFXOutputDev.cc b/lib/pdf/GFXOutputDev.cc index b450e54..635d10d 100644 --- a/lib/pdf/GFXOutputDev.cc +++ b/lib/pdf/GFXOutputDev.cc @@ -371,6 +371,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 +453,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 +473,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); @@ -625,6 +648,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,6 +666,8 @@ 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")) { @@ -994,7 +1020,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; @@ -1443,14 +1470,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 +1531,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 +1560,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"); @@ -1864,9 +1891,9 @@ void GFXOutputDev::processLink(Link *link, Catalog *catalog) } void GFXOutputDev::saveState(GfxState *state) { - dbg("saveState %08x", state); dbgindent+=2; + dbg("saveState %p", state); dbgindent+=2; - msg(" saveState %08x", state); + msg(" saveState %p", state); updateAll(state); if(statepos>=64) { msg(" Too many nested states in pdf."); @@ -1886,13 +1913,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 +1944,7 @@ void GFXOutputDev::restoreState(GfxState *state) { if(verbose) { int t; for(t=0;t<=statepos;t++) { - printf("%08x ", (unsigned int)states[t].state); + printf("%p ", states[t].state); } printf("\n"); } @@ -2415,8 +2442,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; @@ -2649,7 +2676,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; @@ -2659,9 +2686,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); @@ -2674,7 +2701,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) { @@ -2684,8 +2711,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; @@ -2704,7 +2731,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) @@ -2723,7 +2750,7 @@ 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); ops.finish(&ops); @@ -2758,9 +2785,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;