gfxmatrix_t m = this->current_font_matrix;
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 && !config_drawonlyshapes) || 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 */
!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;
- if(m.tx - expected_x >= m.m00*64) {
- msg("<debug> There's a %f (%f) pixel gap between char %d and char %d, I'm inserting a space here",
+ 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,
- (m.tx-expected_x)/m.m00,
+ 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;
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
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");
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);
}
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(verbose) {
int t;
for(t=0;t<=statepos;t++) {
- printf("%08x ", states[t].state);
+ printf("%p ", states[t].state);
}
printf("\n");
}
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) {
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);
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) {
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);
this->device = (gfxdevice_t*)rfx_calloc(sizeof(gfxdevice_t));
gfxdevice_record_init(this->device);
- 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