#endif
}
#ifdef HAVE_FONTCONFIG
+static char stralphacmp(const char*s1, const char*s2)
+{
+ while(*s1 && *s2) {
+ /* skip over space, minus, comma etc. */
+ while(*s1>=32 && *s1<=63) s1++;
+ while(*s2>=32 && *s2<=63) s2++;
+ if(*s1!=*s2)
+ break;
+ s1++;s2++;
+ }
+ return *s1 - *s2;
+}
+
static char fc_ismatch(FcPattern*match, char*family, char*style)
{
char*fcfamily=0,*fcstyle=0,*fcfullname=0,*filename=0;
if(scalable!=FcTrue || outline!=FcTrue)
return 0;
- if (!strcasecmp(fcfamily, family)) {
+ if (!stralphacmp(fcfamily, family)) {
msg("<debug> Font %s-%s (%s) is a match for %s%s%s", fcfamily, fcstyle, filename, family, style?"-":"", style?style:"");
return 1;
} else {
fontfile_t*fd = global_fonts;
while(fd) {
FcConfigAppFontAddFile(config, (FcChar8*)fd->filename);
+ msg("<debug> Adding font %s to fontconfig", fd->filename);
fd = fd->next;
}
if(getLogLevel() >= LOGLEVEL_TRACE) {
int t;
- for(t=0;t<set->nfont;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("<trace> %s-%s -> %s", fcfamily, fcstyle, filename);
+ int p;
+ for(p=0;p<2;p++) {
+ if(set) {
+ for(t=0;t<set->nfont;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("<trace> %s (%s) -> %s", fcfamily, fcstyle, filename);
+ }
+ }
}
+ set = FcConfigGetFonts(config, FcSetApplication);
}
}
}
char*family = strdup(name);
char*style = 0;
char*dash = strchr(family, '-');
+ if(!dash) dash = strchr(family, ',');
+
FcPattern*pattern = 0;
if(dash) {
*dash = 0;
DisplayFontParam *GFXGlobalParams::getDisplayFont(GString *fontName)
{
- msg("<verbose> looking for font %s in global params", fontName->getCString());
+ msg("<verbose> looking for font %s", fontName->getCString());
char*name = fontName->getCString();
}
free(filename);
return dfp;
+ } else {
+ msg("<verbose> Font %s not found\n", name);
+ return GlobalParams::getDisplayFont(fontName);
}
- return GlobalParams::getDisplayFont(fontName);
}
GFXOutputDev::GFXOutputDev(InfoOutputDev*info, PDFDoc*doc)
this->user_clipy1 = 0;
this->user_clipx2 = 0;
this->user_clipy2 = 0;
+ this->current_gfxfont = 0;
this->current_fontinfo = 0;
this->current_text_stroke = 0;
this->current_text_clip = 0;
this->config_remapunicode=0;
this->config_transparent=0;
this->config_extrafontdata = 0;
+ this->config_drawonlyshapes = 0;
this->config_disable_polygon_conversion = 0;
this->config_multiply = 1;
+ this->config_linkdatafile = 0;
this->page2page = 0;
this->num_pages = 0;
this->config_remapunicode = atoi(value);
} else if(!strcmp(key,"transparent")) {
this->config_transparent = atoi(value);
+ } else if(!strcmp(key,"drawonlyshapes")) {
+ this->config_drawonlyshapes = 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,"multiply")) {
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;
return col;
}
-void GFXOutputDev::fillGfxLine(GfxState *state, gfxline_t*line)
+void GFXOutputDev::fillGfxLine(GfxState *state, gfxline_t*line, char evenodd)
{
gfxcolor_t col = getFillColor(state);
if(getLogLevel() >= LOGLEVEL_TRACE) {
- msg("<trace> fill %02x%02x%02x%02x", col.r, col.g, col.b, col.a);
+ msg("<trace> %sfill %02x%02x%02x%02x", evenodd?"eo":"", col.r, col.g, col.b, col.a);
dump_outline(line);
}
device->fill(device, line, &col);
}
-void GFXOutputDev::clipToGfxLine(GfxState *state, gfxline_t*line)
+void GFXOutputDev::clipToGfxLine(GfxState *state, gfxline_t*line, char evenodd)
{
if(getLogLevel() >= LOGLEVEL_TRACE) {
+ msg("<trace> %sclip", evenodd?"eo":"");
dump_outline(line);
}
gfxbbox_t bbox = gfxline_getbbox(line);
gfxline_free(line);
line = line2;
}
- clipToGfxLine(state, line);
+ clipToGfxLine(state, line, 0);
gfxline_free(line);
}
{
GfxPath * path = state->getPath();
gfxline_t*line = gfxPath_to_gfxline(state, path, 1, user_movex + clipmovex, user_movey + clipmovey);
- clipToGfxLine(state, line);
+ clipToGfxLine(state, line, 1);
gfxline_free(line);
}
void GFXOutputDev::clipToStrokePath(GfxState *state)
this->transformXY(state, x-originX, y-originY, &m.tx, &m.ty);
//m.tx += originX; m.ty += originY;
- msg("<debug> 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);
-
- if(render == RENDER_FILL || render == RENDER_INVISIBLE) {
+ msg("<debug> 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) {
+ /* space char detection */
+ if(last_char_gfxfont == current_gfxfont &&
+ last_char_y == m.ty &&
+ !last_char_was_space) {
+ double expected_x = last_char_x + current_gfxfont->glyphs[last_char].advance*m.m00;
+ int space = this->current_fontinfo->space_char;
+ float width = this->current_fontinfo->average_advance;
+ if(m.tx - expected_x >= m.m00*width*4/10) {
+ msg("<debug> There's a %f pixel gap between char %d and char %d (expected no more than %f), I'm inserting a space here",
+ m.tx-expected_x,
+ width*m.m00*4/10,
+ last_char, glyphid);
+ gfxmatrix_t m2 = m;
+ m2.tx = expected_x + (m.tx - expected_x - current_gfxfont->glyphs[space].advance*m.m00)/2;
+ if(m2.tx < expected_x) m2.tx = expected_x;
+ device->drawchar(device, current_gfxfont, space, &col, &m2);
+ }
+ }
+ last_char_gfxfont = current_gfxfont;
+ last_char = glyphid;
+ last_char_x = m.tx;
+ last_char_y = m.ty;
+ last_char_was_space = GLYPH_IS_SPACE(¤t_gfxfont->glyphs[glyphid]);
+ }
device->drawchar(device, current_gfxfont, glyphid, &col, &m);
} else {
msg("<debug> Drawing glyph %d as shape", charid);
msg("<notice> Some texts will be rendered as shape");
gfxglobals->textmodeinfo = 1;
}
+
gfxline_t*glyph = current_gfxfont->glyphs[glyphid].line;
gfxline_t*tglyph = gfxline_clone(glyph);
gfxline_transform(tglyph, &m);
void GFXOutputDev::endString(GfxState *state)
{
int render = state->getRender();
- msg("<trace> endString() render=%d textstroke=%08x", render, current_text_stroke);
+ msg("<trace> endString() render=%d textstroke=%p", render, current_text_stroke);
if(current_text_stroke) {
/* fillstroke and stroke text rendering objects we can process right
however */
device->setparameter(device, "mark","TXT");
if((render&3) == RENDER_FILL) {
- fillGfxLine(state, current_text_stroke);
+ fillGfxLine(state, current_text_stroke, 0);
gfxline_free(current_text_stroke);
current_text_stroke = 0;
} else if((render&3) == RENDER_FILLSTROKE) {
- fillGfxLine(state, current_text_stroke);
+ fillGfxLine(state, current_text_stroke, 0);
strokeGfxline(state, current_text_stroke,0);
gfxline_free(current_text_stroke);
current_text_stroke = 0;
void GFXOutputDev::endTextObject(GfxState *state)
{
int render = state->getRender();
- msg("<trace> endTextObject() render=%d textstroke=%08x clipstroke=%08x", render, current_text_stroke, current_text_clip);
+ msg("<trace> endTextObject() render=%d textstroke=%p clipstroke=%p", render, current_text_stroke, current_text_clip);
if(current_text_clip) {
device->setparameter(device, "mark","TXT");
- clipToGfxLine(state, current_text_clip);
+ clipToGfxLine(state, current_text_clip, 0);
device->setparameter(device, "mark","");
gfxline_free(current_text_clip);
current_text_clip = 0;
gfxmatrix_t m = this->current_font_matrix;
this->transformXY(state, 0, 0, &m.tx, &m.ty);
- m.m00*=INTERNAL_FONT_SIZE;
+
+ /*m.m00*=INTERNAL_FONT_SIZE;
m.m01*=INTERNAL_FONT_SIZE;
m.m10*=INTERNAL_FONT_SIZE;
- m.m11*=INTERNAL_FONT_SIZE;
+ m.m11*=INTERNAL_FONT_SIZE;*/
if(!current_fontinfo || (unsigned)charid >= current_fontinfo->num_glyphs || !current_fontinfo->glyphs[charid]) {
msg("<error> Invalid charid %d for font", charid);
states[statepos].dashPattern = 0;
states[statepos].dashLength = 0;
states[statepos].dashStart = 0;
+
+ this->last_char_gfxfont = 0;
}
else if(s)
{
device->drawlink(device, points, s);
+ if(this->config_linkdatafile) {
+ FILE*fi = fopen(config_linkdatafile, "ab+");
+ fprintf(fi, "%s\n", s);
+ fclose(fi);
+ }
}
-
+
msg("<verbose> \"%s\" link to \"%s\" (%d)", type, FIXNULL(s), page);
free(s);s=0;
}
void GFXOutputDev::saveState(GfxState *state) {
- dbg("saveState %08x", state); dbgindent+=2;
+ dbg("saveState %p", state); dbgindent+=2;
- msg("<trace> saveState %08x", state);
+ msg("<trace> saveState %p", state);
updateAll(state);
if(statepos>=64) {
msg("<fatal> Too many nested states in pdf.");
};
void GFXOutputDev::restoreState(GfxState *state) {
- dbgindent-=2; dbg("restoreState %08x", state);
+ dbgindent-=2; dbg("restoreState %p", state);
if(statepos==0) {
msg("<fatal> Invalid restoreState");
exit(1);
}
- msg("<trace> restoreState %08x%s%s", state,
+ msg("<trace> restoreState %p%s%s", state,
states[statepos].softmask?" (end softmask)":"",
states[statepos].clipping?" (end clipping)":"");
if(states[statepos].softmask) {
}
if(states[statepos].state!=state) {
msg("<fatal> bad state nesting");
+ if(verbose) {
+ int t;
+ for(t=0;t<=statepos;t++) {
+ printf("%p ", states[t].state);
+ }
+ printf("\n");
+ }
exit(1);
}
states[statepos].state=0;
current_gfxfont = this->current_fontinfo->getGfxFont();
device->addfont(device, current_gfxfont);
free(id);
-
+
updateFontMatrix(state);
}
for(t=0;t<256;t++) {
pixBuf[0] = t;
colorMap->getRGB(pixBuf, &rgb);
-
- {/*if(maskColors && *maskColors==t) {
- msg("<notice> Color %d is transparent", t);
- if (imgData->maskColors) {
- *alpha = 0;
- for (i = 0; i < imgData->colorMap->getNumPixelComps(); ++i) {
- if (pix[i] < imgData->maskColors[2*i] ||
- pix[i] > imgData->maskColors[2*i+1]) {
- *alpha = 1;
- break;
- }
- }
- } else {
- *alpha = 1;
- }
- if(!*alpha) {
- pal[t].r = 0;
- pal[t].g = 0;
- pal[t].b = 0;
- pal[t].a = 0;
- }
- } else {*/
- pal[t].r = (unsigned char)(colToByte(rgb.r));
- pal[t].g = (unsigned char)(colToByte(rgb.g));
- pal[t].b = (unsigned char)(colToByte(rgb.b));
- pal[t].a = 255;//(U8)(rgb.b * 255 + 0.5);
- }
+ pal[t].r = (unsigned char)(colToByte(rgb.r));
+ pal[t].g = (unsigned char)(colToByte(rgb.g));
+ pal[t].b = (unsigned char)(colToByte(rgb.b));
+ 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[width*y+x] = pal[pixBuf[0]];
+ if(maskColors && *maskColors==pixBuf[0]) {
+ pic[width*y+x].a = 0;
+ }
}
}
if(maskbitmap) {
} else {
msg("<verbose> 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;
gfxline_free(line);
line = line2;
}
- fillGfxLine(state, line);
+ fillGfxLine(state, line, 0);
gfxline_free(line);
}
GfxPath * path = state->getPath();
gfxline_t*line= gfxPath_to_gfxline(state, path, 1, user_movex + clipmovex, user_movey + clipmovey);
- fillGfxLine(state, line);
+ fillGfxLine(state, line, 1);
gfxline_free(line);
}
memset(f, 0, sizeof(fontfile_t));
f->filename = filename;
int len = strlen(filename);
- char*r1 = strrchr(filename, '/');
- char*r2 = strrchr(filename, '\\');
+ char*r1 = strrchr((char*)filename, '/');
+ char*r2 = strrchr((char*)filename, '\\');
if(r2>r1)
r1 = r2;
if(r1) {
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("<verbose> 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;
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);
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) {
- msg("<fatal> Bad state nesting in transparency group");
- msg("<fatal> Notice: this is a known problem, which will be fixed in 0.9.1");
- msg("<fatal> In the meantime, please convert the file with -s poly2bitmap");
- restoreState(state);
- this->device = states[statepos].olddevice;
+ msg("<error> Invalid state nesting");
}
states[statepos].olddevice = 0;
gfxresult_t*recording = r->finish(r);
- dbg(" forsoftmask=%d recording=%08x/%08x", states[statepos].createsoftmask, r, recording);
- msg("<verbose> endTransparencyGroup forsoftmask=%d recording=%08x/%08x", states[statepos].createsoftmask, r, recording);
+ dbg(" forsoftmask=%d recording=%p/%p", states[statepos].createsoftmask, r, recording);
+ msg("<verbose> endTransparencyGroup forsoftmask=%d recording=%p/%p", states[statepos].createsoftmask, r, recording);
if(states[statepos].createsoftmask) {
states[statepos-1].softmaskrecording = recording;
"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("<verbose> paintTransparencyGroup blend=%s softmaskon=%d", blendmodes[state->getBlendMode()], states[statepos].softmask);
if(state->getBlendMode() == gfxBlendNormal)
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);
}
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;
git.asbjorn.biz / swftools.git / blobdiff