X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fpdf%2FGFXOutputDev.cc;h=8b114cef8c012caa0c36fb5eaedf26c8273a587f;hb=da69617ad9981b5ba86b6baeebf3701ec08e71f2;hp=210f88d62662a5f3fe9cae7aff21b6fce1cc44e1;hpb=010a89e2887299503b1e8dfb08417e38ac7bc98e;p=swftools.git diff --git a/lib/pdf/GFXOutputDev.cc b/lib/pdf/GFXOutputDev.cc index 210f88d..8b114ce 100644 --- a/lib/pdf/GFXOutputDev.cc +++ b/lib/pdf/GFXOutputDev.cc @@ -69,13 +69,18 @@ #include "../devices/ops.h" #include "../devices/arts.h" #include "../devices/render.h" + +#include "../art/libart.h" +#include "../devices/artsutils.c" + #include "../png.h" +#include "fonts.h" #include typedef struct _fontfile { - char*filename; + const char*filename; int used; } fontfile_t; @@ -87,28 +92,34 @@ static int fontnum = 0; static char* lastfontdir = 0; -struct mapping { - char*pdffont; - char*filename; +struct fontentry { + const char*pdffont; + const char*filename; + char*afm; + int afmlen; + char*pfb; + int pfblen; + char*fullfilename; } pdf2t1map[] ={ -{"Times-Roman", "n021003l"}, -{"Times-Italic", "n021023l"}, -{"Times-Bold", "n021004l"}, -{"Times-BoldItalic", "n021024l"}, -{"Helvetica", "n019003l"}, -{"Helvetica-Oblique", "n019023l"}, -{"Helvetica-Bold", "n019004l"}, -{"Helvetica-BoldOblique", "n019024l"}, -{"Courier", "n022003l"}, -{"Courier-Oblique", "n022023l"}, -{"Courier-Bold", "n022004l"}, -{"Courier-BoldOblique", "n022024l"}, -{"Symbol", "s050000l"}, -{"ZapfDingbats", "d050000l"}}; +{"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}, +{"Times-Bold", "n021004l", n021004l_afm, n021004l_afm_len, n021004l_pfb, n021004l_pfb_len}, +{"Times-BoldItalic", "n021024l", n021024l_afm, n021024l_afm_len, n021024l_pfb, n021024l_pfb_len}, +{"Helvetica", "n019003l", n019003l_afm, n019003l_afm_len, n019003l_pfb, n019003l_pfb_len}, +{"Helvetica-Oblique", "n019023l", n019023l_afm, n019023l_afm_len, n019023l_pfb, n019023l_pfb_len}, +{"Helvetica-Bold", "n019004l", n019004l_afm, n019004l_afm_len, n019004l_pfb, n019004l_pfb_len}, +{"Helvetica-BoldOblique", "n019024l", n019024l_afm, n019024l_afm_len, n019024l_pfb, n019024l_pfb_len}, +{"Courier", "n022003l", n022003l_afm, n022003l_afm_len, n022003l_pfb, n022003l_pfb_len}, +{"Courier-Oblique", "n022023l", n022023l_afm, n022023l_afm_len, n022023l_pfb, n022023l_pfb_len}, +{"Courier-Bold", "n022004l", n022004l_afm, n022004l_afm_len, n022004l_pfb, n022004l_pfb_len}, +{"Courier-BoldOblique", "n022024l", n022024l_afm, n022024l_afm_len, n022024l_pfb, n022024l_pfb_len}, +{"Symbol", "s050000l", s050000l_afm, s050000l_afm_len, s050000l_pfb, s050000l_pfb_len}, +{"ZapfDingbats", "d050000l", d050000l_afm, d050000l_afm_len, d050000l_pfb, d050000l_pfb_len}}; + static int verbose = 0; static int dbgindent = 0; -static void dbg(char*format, ...) +static void dbg(const char*format, ...) { char buf[1024]; int l; @@ -141,7 +152,7 @@ typedef struct _feature } feature_t; feature_t*featurewarnings = 0; -void GFXOutputDev::showfeature(char*feature,char fully, char warn) +void GFXOutputDev::showfeature(const char*feature,char fully, char warn) { feature_t*f = featurewarnings; while(f) { @@ -163,27 +174,27 @@ void GFXOutputDev::showfeature(char*feature,char fully, char warn) msg(" File contains %s",feature); } } -void GFXOutputDev::warnfeature(char*feature,char fully) +void GFXOutputDev::warnfeature(const char*feature,char fully) { showfeature(feature,fully,1); } -void GFXOutputDev::infofeature(char*feature) +void GFXOutputDev::infofeature(const char*feature) { showfeature(feature,0,0); } GFXOutputState::GFXOutputState() { this->clipping = 0; - this->textRender = 0; this->createsoftmask = 0; this->transparencygroup = 0; this->softmask = 0; this->grouprecording = 0; + this->isolated = 0; } GBool GFXOutputDev::interpretType3Chars() { - return gTrue; + return this->do_interpretType3Chars; } typedef struct _drawnchar @@ -261,19 +272,37 @@ GFXOutputDev::GFXOutputDev(parameter_t*p) this->pagepos = 0; this->config_use_fontconfig=1; this->config_break_on_warning=0; + this->config_remapunicode=0; + this->config_transparent=0; + this->do_interpretType3Chars = gTrue; this->parameters = p; + + memset(states, 0, sizeof(states)); /* configure device */ while(p) { - if(!strcmp(p->name,"fontconfig")) { - this->config_use_fontconfig = atoi(p->value); - } else if(!strcmp(p->name,"breakonwarning")) { - this->config_break_on_warning = atoi(p->value); - } + setParameter(p->name, p->value); p = p->next; } }; + +void GFXOutputDev::setParameter(const char*key, const char*value) +{ + if(!strcmp(key,"rawtext")) { + this->do_interpretType3Chars = atoi(value)^1; + } else if(!strcmp(key,"breakonwarning")) { + this->config_break_on_warning = atoi(value); + } else if(!strcmp(key,"fontconfig")) { + this->config_use_fontconfig = atoi(value); + } else if(!strcmp(key,"remapunicode")) { + this->config_remapunicode = atoi(value); + } else if(!strcmp(p->name,"transparent")) { + this->config_transparent = atoi(p->value); + } else { + msg(" Ignored parameter: %s=%s", key, value); + } +} void GFXOutputDev::setDevice(gfxdevice_t*dev) { @@ -452,7 +481,7 @@ static char* gfxstate2str(GfxState *state) return mybuf; } -static void dumpFontInfo(char*loglevel, GfxFont*font); +static void dumpFontInfo(const char*loglevel, GfxFont*font); static int lastdumps[1024]; static int lastdumppos = 0; /* nr = 0 unknown @@ -475,11 +504,11 @@ static void showFontError(GfxFont*font, int nr) else if(nr == 1) msg(" The following font caused problems (substituting):"); else if(nr == 2) - msg(" The following Type 3 Font will be rendered as bitmap:"); + msg(" The following Type 3 Font will be rendered as graphics:"); dumpFontInfo("", font); } -static void dumpFontInfo(char*loglevel, GfxFont*font) +static void dumpFontInfo(const char*loglevel, GfxFont*font) { char* id = getFontID(font); char* name = getFontName(font); @@ -640,8 +669,28 @@ GBool GFXOutputDev::useShadedFills() infofeature("shaded fills"); return gFalse; } + +GBool GFXOutputDev::useDrawForm() +{ + infofeature("forms"); + return gFalse; +} +void GFXOutputDev::drawForm(Ref id) +{ + msg(" drawForm not implemented"); +} +GBool GFXOutputDev::needNonText() +{ + return gTrue; +} +void GFXOutputDev::endPage() +{ + msg(" endPage"); +} -void GFXOutputDev::strokeGfxline(GfxState *state, gfxline_t*line) +#define STROKE_FILL 1 +#define STROKE_CLIP 2 +void GFXOutputDev::strokeGfxline(GfxState *state, gfxline_t*line, int flags) { int lineCap = state->getLineCap(); // 0=butt, 1=round 2=square int lineJoin = state->getLineJoin(); // 0=miter, 1=round 2=bevel @@ -709,9 +758,23 @@ void GFXOutputDev::strokeGfxline(GfxState *state, gfxline_t*line) ); dump_outline(line); } - - //swfoutput_drawgfxline(output, line, width, &col, capType, joinType, miterLimit); - device->stroke(device, line, width, &col, capType, joinType, miterLimit); + + if(flags&STROKE_FILL) { + ArtSVP* svp = gfxstrokeToSVP(line, width, capType, joinType, miterLimit); + gfxline_t*gfxline = SVPtogfxline(svp); + if(flags&STROKE_CLIP) { + device->startclip(device, gfxline); + states[statepos].clipping++; + } else { + device->fill(device, gfxline, &col); + } + free(gfxline); + art_svp_free(svp); + } else { + if(flags&STROKE_CLIP) + msg(" Stroke&clip not supported at the same time"); + device->stroke(device, line, width, &col, capType, joinType, miterLimit); + } if(line2) gfxline_free(line2); @@ -774,6 +837,13 @@ void GFXOutputDev::eoClip(GfxState *state) states[statepos].clipping++; gfxline_free(line); } +void GFXOutputDev::clipToStrokePath(GfxState *state) +{ + GfxPath * path = state->getPath(); + gfxline_t*line= gfxPath_to_gfxline(state, path, 0, user_movex + clipmovex, user_movey + clipmovey); + strokeGfxline(state, line, STROKE_FILL|STROKE_CLIP); + gfxline_free(line); +} void GFXOutputDev::endframe() { @@ -781,8 +851,6 @@ void GFXOutputDev::endframe() device->endclip(device); outer_clip_box = 0; } - - device->endpage(device); } void GFXOutputDev::finish() @@ -823,7 +891,7 @@ GBool GFXOutputDev::useDrawChar() return gTrue; } -char*renderModeDesc[]= {"fill", "stroke", "fill+stroke", "invisible", +const char*renderModeDesc[]= {"fill", "stroke", "fill+stroke", "invisible", "clip+fill", "stroke+clip", "fill+stroke+clip", "clip"}; #define RENDER_FILL 0 @@ -861,7 +929,9 @@ char* makeStringPrintable(char*str) int getGfxCharID(gfxfont_t*font, int charnr, char *charname, int u) { - char*uniname = 0; + const char*uniname = 0; + if(!font) + return charnr; if(u>0) { int t; /* find out char name from unicode index @@ -916,6 +986,14 @@ int getGfxCharID(gfxfont_t*font, int charnr, char *charname, int u) msg(" Char [%d,%s,>%d<] maps to %d\n", charnr, charname, u, font->unicode2glyph[u]); return font->unicode2glyph[u]; } + /* try to use the unicode|0xe000 (needed for some WingDings fonts) + FIXME: do this only if we know the font is wingdings? + */ + u |= 0xe000; + if(u>=0 && umax_unicode && font->unicode2glyph[u]>=0) { + msg(" Char [%d,%s,>%d<] maps to %d\n", charnr, charname, u, font->unicode2glyph[u]); + return font->unicode2glyph[u]; + } if(charnr>=0 && charnrnum_glyphs) { msg(" Char [>%d<,%s,%d] maps to %d\n", charnr, charname, u, charnr); @@ -948,8 +1026,20 @@ void GFXOutputDev::beginString(GfxState *state, GString *s) this->current_font_matrix.ty = 0; gfxmatrix_t m = this->current_font_matrix; +} - states[statepos].textRender = render; +static gfxline_t* mkEmptyGfxShape(double x, double y) +{ + gfxline_t*line = (gfxline_t*)malloc(sizeof(gfxline_t)); + line->x = x;line->y = y;line->type = gfx_moveTo;line->next = 0; + return line; +} + +static char isValidUnicode(int c) +{ + if(c>=32 && c<0x2fffe) + return 1; + return 0; } void GFXOutputDev::drawChar(GfxState *state, double x, double y, @@ -964,15 +1054,12 @@ void GFXOutputDev::drawChar(GfxState *state, double x, double y, return; } - if(states[statepos].textRender != render) - msg(" Internal error: drawChar.render!=beginString.render"); - gfxcolor_t col = getFillColor(state); Gushort *CIDToGIDMap = 0; GfxFont*font = state->getFont(); - if(font->getType() == fontType3) { + if(font->getType() == fontType3 && do_interpretType3Chars) { /* type 3 chars are passed as graphics */ msg(" type3 char at %f/%f", x, y); return; @@ -984,6 +1071,13 @@ void GFXOutputDev::drawChar(GfxState *state, double x, double y, if(uLen) u = _u[0]; +/* char*fontname = getFontName(font); + if(u<256 && strstr(fontname, "ingdings")) { + // symbols are at 0xe000 in the unicode table + u |= 0xe000; + } + free(fontname);*/ + if(font->isCIDFont()) { GfxCIDFont*cfont = (GfxCIDFont*)font; @@ -1026,12 +1120,35 @@ void GFXOutputDev::drawChar(GfxState *state, double x, double y, FIXNULL(name),c, u, FIXNULL((char*)current_gfxfont->id), current_gfxfont->num_glyphs); return; } + //useless- the font has already been passed to the output device + //if(!isValidUnicode(current_gfxfont->glyphs[charid].unicode) && isValidUnicode(u)) { + // current_gfxfont->glyphs[charid]. + //} gfxmatrix_t m = this->current_font_matrix; state->transform(x, y, &m.tx, &m.ty); m.tx += user_movex + clipmovex; m.ty += user_movey + clipmovey; + if((!name || strcmp(name, "space")) && charid!=32 && u!=32) + { + gfxline_t*l = current_gfxfont->glyphs[charid].line; + double x,y; + char ok = 0; + while(l) { + if((l->type == gfx_lineTo || l->type == gfx_splineTo) && l->x!=x && l->y!=y) { + ok = 1; + } + l = l->next; + } + if(!ok) { + static int lastemptychar = 0; + if(charid != lastemptychar) + msg(" Drawing empty character charid=%d u=%d", charid, u); + lastemptychar = charid; + } + } + if(render == RENDER_FILL) { device->drawchar(device, current_gfxfont, charid, &col, &m); } else { @@ -1050,6 +1167,9 @@ void GFXOutputDev::drawChar(GfxState *state, double x, double y, if(render&RENDER_CLIP) { gfxline_t*add = gfxline_clone(tglyph); current_text_clip = gfxline_append(current_text_clip, add); + if(!current_text_clip) { + current_text_clip = mkEmptyGfxShape(m.tx, m.ty); + } } gfxline_free(tglyph); } @@ -1059,8 +1179,6 @@ void GFXOutputDev::endString(GfxState *state) { int render = state->getRender(); msg(" endString() render=%d textstroke=%08x", render, current_text_stroke); - if(states[statepos].textRender != render) - msg(" Internal error: drawChar.render!=beginString.render"); if(current_text_stroke) { /* fillstroke and stroke text rendering objects we can process right @@ -1074,11 +1192,11 @@ void GFXOutputDev::endString(GfxState *state) current_text_stroke = 0; } else if((render&3) == RENDER_FILLSTROKE) { fillGfxLine(state, current_text_stroke); - strokeGfxline(state, current_text_stroke); + strokeGfxline(state, current_text_stroke,0); gfxline_free(current_text_stroke); current_text_stroke = 0; } else if((render&3) == RENDER_STROKE) { - strokeGfxline(state, current_text_stroke); + strokeGfxline(state, current_text_stroke,0); gfxline_free(current_text_stroke); current_text_stroke = 0; } @@ -1090,8 +1208,6 @@ void GFXOutputDev::endTextObject(GfxState *state) { int render = state->getRender(); msg(" endTextObject() render=%d textstroke=%08x clipstroke=%08x", render, current_text_stroke, current_text_clip); - if(states[statepos].textRender != render) - msg(" Internal error: drawChar.render!=beginString.render"); if(current_text_clip) { device->setparameter(device, "mark","TXT"); @@ -1117,6 +1233,16 @@ GBool GFXOutputDev::beginType3Char(GfxState *state, double x, double y, double d { msg(" beginType3Char %d, %08x, %d", code, *u, uLen); type3active = 1; + + /*int t; + + gfxcolor_t col={255,0,0,0}; + gfxmatrix_t m = {1,0,0, 0,1,0}; + + for(t=0;tdrawchar(device, 0, u[t], &col, &m); + }*/ + /* the character itself is going to be passed using the draw functions */ return gFalse; /* gTrue= is_in_cache? */ } @@ -1197,10 +1323,12 @@ void GFXOutputDev::startPage(int pageNum, GfxState *state, double crop_x1, doubl clippath[3].type = gfx_lineTo;clippath[3].x = x1; clippath[3].y = y2; clippath[3].next = &clippath[4]; clippath[4].type = gfx_lineTo;clippath[4].x = x1; clippath[4].y = y1; clippath[4].next = 0; device->startclip(device, clippath); outer_clip_box = 1; - device->fill(device, clippath, &white); + if(!config_transparent) + device->fill(device, clippath, &white); } -void GFXOutputDev::processLink(Link *link, Catalog *catalog) + +void GFXOutputDev::processLink(Link *link, Catalog *catalog) { double x1, y1, x2, y2, w; gfxline_t points[5]; @@ -1244,7 +1372,7 @@ void GFXOutputDev::processLink(Link *link, Catalog *catalog) LinkAction*action=link->getAction(); char buf[128]; char*s = 0; - char*type = "-?-"; + const char*type = "-?-"; char*named = 0; int page = -1; msg(" drawlink action=%d\n", action->getKind()); @@ -1394,7 +1522,6 @@ void GFXOutputDev::saveState(GfxState *state) { return; } statepos ++; - states[statepos].textRender = states[statepos-1].textRender; states[statepos].createsoftmask = states[statepos-1].createsoftmask; states[statepos].transparencygroup = states[statepos-1].transparencygroup; states[statepos].clipping = 0; @@ -1407,7 +1534,8 @@ void GFXOutputDev::restoreState(GfxState *state) { msg(" Invalid restoreState"); return; } - msg(" restoreState"); + msg(" restoreState%s%s", states[statepos].softmask?" (end softmask)":"", + states[statepos].clipping?" (end clipping)":""); if(states[statepos].softmask) { clearSoftMask(state); } @@ -1419,35 +1547,57 @@ void GFXOutputDev::restoreState(GfxState *state) { statepos--; } -char* GFXOutputDev::searchFont(char*name) +char* writeOutStdFont(fontentry* f) +{ + FILE*fi; + char namebuf1[512]; + char namebuf2[512]; + char* tmpFileName = mktmpname(namebuf1); + + sprintf(namebuf2, "%s.afm", tmpFileName); + fi = fopen(namebuf2, "wb"); + if(!fi) + return 0; + fwrite(f->afm, 1, f->afmlen, fi); + fclose(fi); + + sprintf(namebuf2, "%s.pfb", tmpFileName); + fi = fopen(namebuf2, "wb"); + if(!fi) + return 0; + fwrite(f->pfb, 1, f->pfblen, fi); + fclose(fi); + + return strdup(namebuf2); +} + +char* GFXOutputDev::searchFont(const char*name) { int i; char*filename=0; - int is_standard_font = 0; msg(" SearchFont(%s)", name); /* see if it is a pdf standard font */ - for(i=0;i Couldn't save default font- is the Temp Directory writable?"); + } else { + msg(" Storing standard PDF font %s at %s", name, pdf2t1map[i].fullfilename); + } + } + return strdup(pdf2t1map[i].fullfilename); } } - /* look in all font files */ + /* else look in all font files */ for(i=0;i Using %s for %s", fonts[i].filename, name); - } + if(strstr(fonts[i].filename, name)) { return strdup(fonts[i].filename); } } @@ -1558,7 +1708,7 @@ char*GFXOutputDev::writeEmbeddedFontToFile(XRef*ref, GfxFont*font) } FoFiType1C *cvt = FoFiType1C::make(fontBuf, fontLen); if(!cvt) return 0; - cvt->convertToType1(NULL, gTrue, FoFiWrite, f); + cvt->convertToType1(0, NULL, gTrue, FoFiWrite, f); //cvt->convertToCIDType0("test", f); //cvt->convertToType0("test", f); delete cvt; @@ -1730,7 +1880,7 @@ char* GFXOutputDev::searchForSuitableFont(GfxFont*gfxFont) char* GFXOutputDev::substituteFont(GfxFont*gfxFont, char* oldname) { - char*fontname = 0, *filename = 0; + const char*fontname = 0, *filename = 0; msg(" substituteFont(%s)", oldname); if(!(fontname = searchForSuitableFont(gfxFont))) { @@ -1790,7 +1940,7 @@ void GFXOutputDev::setXRef(PDFDoc*doc, XRef *xref) this->xref = xref; } -int GFXOutputDev::setGfxFont(char*id, char*name, char*filename, double maxSize) +int GFXOutputDev::setGfxFont(char*id, char*name, char*filename, double maxSize, CharCodeToUnicode*ctu) { gfxfont_t*font = 0; fontlist_t*last=0,*l = this->fontlist; @@ -1818,13 +1968,23 @@ int GFXOutputDev::setGfxFont(char*id, char*name, char*filename, double maxSize) double quality = (1024 * 0.05) / maxSize; msg(" Loading %s...", filename); - font = gfxfont_load(id, filename, quality); + font = gfxfont_load(id, filename, 0, quality); if(!font) { msg(" Couldn't load Font %s (%s)", filename, id); return 0; } msg(" Font %s (%s) loaded successfully", filename, id); + if(this->config_remapunicode && ctu) { + int c; + for(c=0;cnum_glyphs;c++) { + Unicode u[8]; + int uLen = ctu->mapToUnicode(c, u, 8); + if(uLen && !isValidUnicode(font->glyphs[c].unicode) && isValidUnicode(u[0])) + font->glyphs[c].unicode = u[0]; + } + } + l = new fontlist_t; l->font = font; l->filename = strdup(filename); @@ -1870,7 +2030,7 @@ void GFXOutputDev::updateFont(GfxState *state) /* second, see if this is a font which was used before- if so, we are done */ - if(setGfxFont(fontid, fontname, 0, 0)) { + if(setGfxFont(fontid, fontname, 0, 0, gfxFont->getCTU())) { free(fontid); free(fontname); return; @@ -1943,8 +2103,8 @@ void GFXOutputDev::updateFont(GfxState *state) //swfoutput_setfont(&device, fontid, fileName); - if(!setGfxFont(fontid, fontname, 0, 0)) { - setGfxFont(fontid, fontname, fileName, maxSize); + if(!setGfxFont(fontid, fontname, 0, 0, gfxFont->getCTU())) { + setGfxFont(fontid, fontname, fileName, maxSize, gfxFont->getCTU()); } if(fileName && del) @@ -2390,13 +2550,14 @@ void GFXOutputDev::stroke(GfxState *state) GfxPath * path = state->getPath(); gfxline_t*line= gfxPath_to_gfxline(state, path, 0, user_movex + clipmovex, user_movey + clipmovey); - strokeGfxline(state, line); + strokeGfxline(state, line, 0); gfxline_free(line); } void GFXOutputDev::fill(GfxState *state) { - dbg("fill"); + gfxcolor_t col = getFillColor(state); + dbg("fill %02x%02x%02x%02x",col.r,col.g,col.b,col.a); GfxPath * path = state->getPath(); gfxline_t*line= gfxPath_to_gfxline(state, path, 1, user_movex + clipmovex, user_movey + clipmovey); @@ -2406,24 +2567,17 @@ void GFXOutputDev::fill(GfxState *state) void GFXOutputDev::eoFill(GfxState *state) { - dbg("eofill"); - - GfxPath * path = state->getPath(); gfxcolor_t col = getFillColor(state); + dbg("eofill %02x%02x%02x%02x",col.r,col.g,col.b,col.a); + GfxPath * path = state->getPath(); gfxline_t*line= gfxPath_to_gfxline(state, path, 1, user_movex + clipmovex, user_movey + clipmovey); - - if(getLogLevel() >= LOGLEVEL_TRACE) { - msg(" eofill\n"); - dump_outline(line); - } - - device->fill(device, line, &col); + fillGfxLine(state, line); gfxline_free(line); } -static char* dirseparator() +static const char* dirseparator() { #ifdef WIN32 return "\\"; @@ -2432,7 +2586,7 @@ static char* dirseparator() #endif } -void addGlobalFont(char*filename) +void addGlobalFont(const char*filename) { fontfile_t f; memset(&f, 0, sizeof(fontfile_t)); @@ -2445,10 +2599,10 @@ void addGlobalFont(char*filename) } } -void addGlobalLanguageDir(char*dir) +void addGlobalLanguageDir(const char*dir) { if(!globalParams) - globalParams = new GlobalParams(""); + globalParams = new GlobalParams((char*)""); msg(" Adding %s to language pack directories", dir); @@ -2468,7 +2622,7 @@ void addGlobalLanguageDir(char*dir) fclose(fi); } -void addGlobalFontDir(char*dirname) +void addGlobalFontDir(const char*dirname) { #ifdef HAVE_DIRENT_H msg(" Adding %s to font directories", dirname); @@ -2615,13 +2769,12 @@ BBox mkBBox(GfxState*state, double*bbox, double width, double height) return nbbox; } -#if xpdfUpdateVersion >= 16 void GFXOutputDev::beginTransparencyGroup(GfxState *state, double *bbox, GfxColorSpace *blendingColorSpace, GBool isolated, GBool knockout, GBool forSoftMask) { - char*colormodename = ""; + const char*colormodename = ""; BBox rect = mkBBox(state, bbox, this->width, this->height); if(blendingColorSpace) { @@ -2630,10 +2783,12 @@ void GFXOutputDev::beginTransparencyGroup(GfxState *state, double *bbox, dbg("beginTransparencyGroup %.1f/%.1f/%.1f/%.1f %s isolated=%d knockout=%d forsoftmask=%d", bbox[0],bbox[1],bbox[2],bbox[3], colormodename, isolated, knockout, forSoftMask); dbg("using clipping rect %f/%f/%f/%f\n", rect.posx,rect.posy,rect.width,rect.height); 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; states[statepos].transparencygroup = !forSoftMask; - states[statepos].olddevice = this->device; + states[statepos].isolated = isolated; + states[statepos].olddevice = this->device; this->device = (gfxdevice_t*)rfx_calloc(sizeof(gfxdevice_t)); gfxdevice_record_init(this->device); @@ -2667,9 +2822,9 @@ void GFXOutputDev::endTransparencyGroup(GfxState *state) void GFXOutputDev::paintTransparencyGroup(GfxState *state, double *bbox) { - char*blendmodes[] = {"normal","multiply","screen","overlay","darken", "lighten", - "colordodge","colorburn","hardlight","softlight","difference", - "exclusion","hue","saturation","color","luminosity"}; + const char*blendmodes[] = {"normal","multiply","screen","overlay","darken", "lighten", + "colordodge","colorburn","hardlight","softlight","difference", + "exclusion","hue","saturation","color","luminosity"}; dbg("paintTransparencyGroup blend=%s softmaskon=%d", blendmodes[state->getBlendMode()], states[statepos].softmask); msg(" paintTransparencyGroup blend=%s softmaskon=%d", blendmodes[state->getBlendMode()], states[statepos].softmask); @@ -2715,6 +2870,18 @@ void GFXOutputDev::setSoftMask(GfxState *state, double *bbox, GBool alpha, Funct dbg("softmaskrecording is %08x at statepos %d\n", states[statepos].softmaskrecording, statepos); states[statepos].softmask = 1; + states[statepos].softmask_alpha = alpha; +} + +static inline Guchar div255(int x) { + return (Guchar)((x + (x >> 8) + 0x80) >> 8); +} + +static unsigned char clampU8(unsigned char c, unsigned char min, unsigned char max) +{ + if(c < min) c = min; + if(c > max) c = max; + return c; } void GFXOutputDev::clearSoftMask(GfxState *state) @@ -2751,15 +2918,21 @@ void GFXOutputDev::clearSoftMask(GfxState *state) #endif int width = (int)bbox.xmax,height = (int)bbox.ymax; + if(width<=0 || height<=0) + return; gfxdevice_t belowrender; gfxdevice_render_init(&belowrender); + if(states[statepos+1].isolated) { + belowrender.setparameter(&belowrender, "fillwhite", "1"); + } belowrender.setparameter(&belowrender, "antialize", "2"); belowrender.startpage(&belowrender, width, height); gfxresult_record_replay(below, &belowrender); 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); gfxdevice_t maskrender; gfxdevice_render_init(&maskrender); @@ -2779,14 +2952,20 @@ void GFXOutputDev::clearSoftMask(GfxState *state) gfxcolor_t* l1 = &maskimg->data[maskimg->width*y]; gfxcolor_t* l2 = &belowimg->data[belowimg->width*y]; for(x=0;xa = 255; - l2->a = (77*l1->r + 151*l1->g + 28*l1->b) >> 8; + int alpha; + if(states[statepos].softmask_alpha) { + alpha = l1->a; + } else { + alpha = (77*l1->r + 151*l1->g + 28*l1->b) >> 8; + } - /* premultiply alpha... do we need this? (depends on output device) - l2->r = (l2->a*l2->r) >> 8; - l2->g = (l2->a*l2->g) >> 8; - l2->b = (l2->a*l2->b) >> 8; - */ + l2->a = div255(alpha*l2->a); + + /* DON'T premultiply alpha- this is done by fillbitmap, + depending on the output device */ + //l2->r = div255(alpha*l2->r); + //l2->g = div255(alpha*l2->g); + //l2->b = div255(alpha*l2->b); l1++; l2++; @@ -2807,8 +2986,6 @@ void GFXOutputDev::clearSoftMask(GfxState *state) states[statepos].softmaskrecording = 0; } -#endif - /*class MemCheck { public: ~MemCheck()