#include "OutputDev.h"
#include "GfxFont.h"
#include "GfxState.h"
-#include "NameToUnicodeTable.h"
+//#include "NameToUnicodeTable.h"
#include "GlobalParams.h"
#include "GFXOutputDev.h"
if(!verbose)
return;
va_start(arglist, format);
- vsprintf(buf, format, arglist);
+ vsnprintf(buf, sizeof(buf)-1, format, arglist);
va_end(arglist);
l = strlen(buf);
while(l && buf[l-1]=='\n') {
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_optimize_polygons = 0;
+ this->config_drawonlyshapes = 0;
+ this->config_disable_polygon_conversion = 0;
this->config_multiply = 1;
- this->dashPattern = 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,"convertgradients")) {
this->config_multiply = atoi(value);
if(this->config_multiply<1)
this->config_multiply=1;
- } else if(!strcmp(key,"optimize_polygons")) {
- this->config_optimize_polygons = atoi(value);
+ } else if(!strcmp(key,"disable_polygon_conversion")) {
+ this->config_disable_polygon_conversion = atoi(value);
}
}
}
}
+void gfxPath_dump(GfxPath*path)
+{
+ int num = path->getNumSubpaths();
+ int t;
+ int cpos=0;
+ for(t = 0; t < num; t++) {
+ GfxSubpath *subpath = path->getSubpath(t);
+ int subnum = subpath->getNumPoints();
+ int s;
+ for(s=0;s<subnum;s++) {
+ double x=subpath->getX(s);
+ double y=subpath->getY(s);
+ if(s==0 && !subpath->getCurve(s)) {
+ printf("M %f %f\n", x, y);
+ } else if(s==0 && subpath->getCurve(s)) {
+ printf("E %f %f\n", x, y);
+ } else if(subpath->getCurve(s)) {
+ printf("C %f %f\n", x, y);
+ } else {
+ printf("T %f %f\n", x, y);
+ }
+ }
+ }
+}
+
gfxline_t* GFXOutputDev::gfxPath_to_gfxline(GfxState*state, GfxPath*path, int closed, int user_movex, int user_movey)
{
int num = path->getNumSubpaths();
device->endclip(device);
outer_clip_box = 0;
}
- this->dashPattern = 0;
/* notice: we're not fully done yet with this page- there might still be
a few calls to drawLink() yet to come */
}
if(lineCap == 0) capType = gfx_capButt;
else if(lineCap == 1) capType = gfx_capRound;
else if(lineCap == 2) capType = gfx_capSquare;
+ else msg("<error> Invalid line cap type");
gfx_joinType joinType = gfx_joinRound;
if(lineJoin == 0) joinType = gfx_joinMiter;
else if(lineJoin == 1) joinType = gfx_joinRound;
else if(lineJoin == 2) joinType = gfx_joinBevel;
+ else msg("<error> Invalid line join type");
gfxline_t*line2 = 0;
- if(this->dashLength && this->dashPattern) {
- float * dash = (float*)malloc(sizeof(float)*(this->dashLength+1));
+ int dashLength = states[statepos].dashLength;
+ double*dashPattern = states[statepos].dashPattern;
+ double dashStart = states[statepos].dashStart;
+ if(dashLength && dashPattern) {
+ float * dash = (float*)malloc(sizeof(float)*(dashLength+1));
int t;
/* try to find out how much the transformation matrix would
the current transformation matrix. However there are few
PDFs which actually stretch a dashed path in a non-orthonormal
way */
- double tx1, ty1, tx2, ty2;
+ double tx1, ty1, tx2, ty2, tx3, ty3;
this->transformXY(state, 0, 0, &tx1, &ty1);
- this->transformXY(state, 1, 1, &tx2, &ty2);
- double f = sqrt(sqr(tx2-tx1)+sqr(ty2-ty1)) / SQRT2;
-
- msg("<trace> %d dashes", this->dashLength);
- msg("<trace> | phase: %f", this->dashStart);
- for(t=0;t<this->dashLength;t++) {
- dash[t] = (float)this->dashPattern[t] * f;
- if(!dash[t])
+ this->transformXY(state, 0, 1, &tx2, &ty2);
+ this->transformXY(state, 1, 0, &tx3, &ty3);
+ double d1 = sqrt(sqr(tx2-tx1)+sqr(ty2-ty1));
+ double d2 = sqrt(sqr(tx3-tx1)+sqr(ty3-ty1));
+ if(fabs(d1-d2)>0.5)
+ warnfeature("non-ortogonally dashed strokes", 0);
+ double f = (d1+d2)/2;
+
+ msg("<trace> %d dashes", dashLength);
+ msg("<trace> | phase: %f", dashStart);
+ for(t=0;t<dashLength;t++) {
+ dash[t] = (float)dashPattern[t] * f;
+ if(!dash[t]) {
dash[t] = 1e-37;
- msg("<trace> | d%-3d: %f", t, this->dashPattern[t]);
+ }
+ msg("<trace> | d%-3d: %f", t, dashPattern[t]);
}
- dash[this->dashLength] = -1;
+ dash[dashLength] = -1;
if(getLogLevel() >= LOGLEVEL_TRACE) {
dump_outline(line);
}
+
+ line2 = gfxtool_dash_line(line, dash, (float)(dashStart*f));
+ line = line2;
- line2 = gfxtool_dash_line(line, dash, (float)(this->dashStart*f));
- line = line2;
free(dash);
msg("<trace> After dashing:");
}
msg("<trace> stroke width=%f join=%s cap=%s dashes=%d color=%02x%02x%02x%02x",
width,
lineJoin==0?"miter": (lineJoin==1?"round":"bevel"),
- lineCap==0?"butt": (lineJoin==1?"round":"square"),
- this->dashLength,
+ lineCap==0?"butt": (lineCap==1?"round":"square"),
+ dashLength,
col.r,col.g,col.b,col.a
);
dump_outline(line);
}
if(flags&STROKE_FILL) {
- gfxpoly_t* poly = gfxpoly_strokeToPoly(line, width, capType, joinType, miterLimit);
- gfxline_t*gfxline = gfxpoly_to_gfxline(poly);
+ gfxpoly_t* poly = gfxpoly_from_stroke(line, width, capType, joinType, miterLimit, DEFAULT_GRID);
+ gfxline_t*gfxline = gfxline_from_gfxpoly(poly);
if(getLogLevel() >= LOGLEVEL_TRACE) {
dump_outline(gfxline);
}
device->fill(device, gfxline, &col);
}
gfxline_free(gfxline);
- gfxpoly_free(poly);
+ gfxpoly_destroy(poly);
} else {
if(flags&STROKE_CLIP)
msg("<error> Stroke&clip not supported at the same time");
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);
GfxPath * path = state->getPath();
msg("<trace> clip");
gfxline_t*line = gfxPath_to_gfxline(state, path, 1, user_movex + clipmovex, user_movey + clipmovey);
- if(config_optimize_polygons) {
- gfxline_t*line2 = gfxline_circularToEvenOdd(line);
+ if(!config_disable_polygon_conversion) {
+ gfxline_t*line2 = gfxpoly_circular_to_evenodd(line, DEFAULT_GRID);
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)
GFXOutputDev::~GFXOutputDev()
{
finish();
- if(this->dashPattern) {
- free(this->dashPattern);this->dashPattern = 0;
- }
};
GBool GFXOutputDev::upsideDown()
{
if(current_text_stroke) {
msg("<error> Error: Incompatible change of text rendering to %d while inside cliptext", render);
}
-
msg("<trace> beginString(%s) render=%d", makeStringPrintable(s->getCString()), render);
}
}
Unicode u = uLen?(_u[0]):0;
- msg("<debug> drawChar(%f,%f,c='%c' (%d), u=%d <%d>) CID=%d render=%d glyphid=%d font=%08x",x,y,(charid&127)>=32?charid:'?', charid, u, uLen, font->isCIDFont(), render, glyphid, current_gfxfont);
gfxmatrix_t m = this->current_font_matrix;
this->transformXY(state, x-originX, y-originY, &m.tx, &m.ty);
//m.tx += originX; m.ty += originY;
- 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=%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) {
+ 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;
+ 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",
+ m.tx-expected_x,
+ (m.tx-expected_x)/m.m00,
+ 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);
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;
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;
states[statepos].clipbbox.xmax = x2;
states[statepos].clipbbox.ymax = y2;
- this->dashPattern = 0;
- this->dashLength = 0;
- this->dashStart = 0;
+ states[statepos].dashPattern = 0;
+ states[statepos].dashLength = 0;
+ states[statepos].dashStart = 0;
+
+ this->last_char_gfxfont = 0;
}
states[statepos].clipping = 0;
states[statepos].olddevice = 0;
states[statepos].clipbbox = states[statepos-1].clipbbox;
+
+ states[statepos].dashPattern = states[statepos-1].dashPattern;
+ states[statepos].dashStart = states[statepos-1].dashStart;
+ states[statepos].dashLength = states[statepos-1].dashLength;
};
void GFXOutputDev::restoreState(GfxState *state) {
if(states[statepos].softmask) {
clearSoftMask(state);
}
+
+ if(states[statepos].dashPattern) {
+ if(!statepos || states[statepos-1].dashPattern != states[statepos].dashPattern) {
+ free(states[statepos].dashPattern);
+ states[statepos].dashPattern = 0;
+ }
+ }
+
updateAll(state);
while(states[statepos].clipping) {
}
if(states[statepos].state!=state) {
msg("<fatal> bad state nesting");
+ if(verbose) {
+ int t;
+ for(t=0;t<=statepos;t++) {
+ printf("%08x ", states[t].state);
+ }
+ printf("\n");
+ }
exit(1);
}
states[statepos].state=0;
void GFXOutputDev::updateLineDash(GfxState *state)
{
- if(this->dashPattern) {
- free(this->dashPattern);this->dashPattern = 0;
+ if(states[statepos].dashPattern &&
+ (!statepos || states[statepos-1].dashPattern != states[statepos].dashPattern)) {
+ free(states[statepos].dashPattern);
+ states[statepos].dashPattern = 0;
}
double *pattern = 0;
- state->getLineDash(&pattern, &this->dashLength, &this->dashStart);
- msg("<debug> updateLineDash, %d dashes", this->dashLength);
- if(!this->dashLength) {
- this->dashPattern = 0;
+ int dashLength;
+ double dashStart;
+ state->getLineDash(&pattern, &dashLength, &dashStart);
+ msg("<debug> updateLineDash, %d dashes", dashLength);
+ if(!dashLength) {
+ states[statepos].dashPattern = 0;
+ states[statepos].dashLength = 0;
} else {
- double*p = (double*)malloc(this->dashLength*sizeof(this->dashPattern[0]));
- memcpy(p, pattern, this->dashLength*sizeof(this->dashPattern[0]));
- this->dashPattern = p;
+ double*p = (double*)malloc(dashLength*sizeof(states[statepos].dashPattern[0]));
+ memcpy(p, pattern, dashLength*sizeof(states[statepos].dashPattern[0]));
+ states[statepos].dashPattern = p;
+ states[statepos].dashLength = dashLength;
+ states[statepos].dashStart = dashStart;
}
}
GfxPath * path = state->getPath();
gfxline_t*line= gfxPath_to_gfxline(state, path, 1, user_movex + clipmovex, user_movey + clipmovey);
- if(config_optimize_polygons) {
- gfxline_t*line2 = gfxline_circularToEvenOdd(line);
+ if(!config_disable_polygon_conversion) {
+ gfxline_t*line2 = gfxpoly_circular_to_evenodd(line, DEFAULT_GRID);
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) {
this->device = states[statepos].olddevice;
if(!this->device) {
- msg("<fatal> bad state nesting in transparency group- PDF file broken?");
- /* if these errors occur more often, we should build a seperate
- transparency group stack, like xpdf/SplashOutputDev.cc does */
- restoreState(state);
- this->device = states[statepos].olddevice;
+ msg("<error> Invalid state nesting");
}
states[statepos].olddevice = 0;