X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fpdf%2FGFXOutputDev.cc;h=b0d11692ae2c9d5ae21bed36db482344c8aab7a1;hb=ccffa917cdf47a92f21c8789794028c30cbb5019;hp=deb6f0a6c3622395f66bde381b18578b9008620f;hpb=339d6e2778383e1eb7807e0cc16f2e93e402e877;p=swftools.git
diff --git a/lib/pdf/GFXOutputDev.cc b/lib/pdf/GFXOutputDev.cc
index deb6f0a..b0d1169 100644
--- a/lib/pdf/GFXOutputDev.cc
+++ b/lib/pdf/GFXOutputDev.cc
@@ -58,7 +58,7 @@
#include "OutputDev.h"
#include "GfxFont.h"
#include "GfxState.h"
-#include "NameToUnicodeTable.h"
+//#include "NameToUnicodeTable.h"
#include "GlobalParams.h"
#include "GFXOutputDev.h"
@@ -93,9 +93,6 @@ typedef struct _fontfile
static fontfile_t* global_fonts = 0;
static fontfile_t* global_fonts_next = 0;
-static fontfile_t* global_fontdirs = 0;
-static fontfile_t* global_fontdirs_next = 0;
-
static int fontnum = 0;
/* config */
@@ -135,7 +132,7 @@ static void dbg(const char*format, ...)
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') {
@@ -395,17 +392,6 @@ char* fontconfig_searchForFont(char*name)
fprintf(fi, "
WINDOWSFONTDIR\n");
#endif
fprintf(fi, "~/.fonts\n");
-
- /* add external font dirs to fontconfig's config. Maybe fc will make more out
- of them than we did
- FIXME: we don't do that yet if there's a system config file
- */
- fontfile_t*fd = global_fontdirs;
- while(fd) {
- fprintf(fi, "%s\n", fd->filename);
- fd = fd->next;
- }
-
#ifdef WIN32
fprintf(fi, "WINDOWSTEMPDIR_FONTCONFIG_CACHE\n");
#endif
@@ -428,6 +414,14 @@ char* fontconfig_searchForFont(char*name)
config_use_fontconfig = 0;
return 0;
}
+
+ /* add external fonts to fontconfig's config, too. */
+ fontfile_t*fd = global_fonts;
+ while(fd) {
+ FcConfigAppFontAddFile(config, (FcChar8*)fd->filename);
+ fd = fd->next;
+ }
+
FcFontSet * set = FcConfigGetFonts(config, FcSetSystem);
msg(" FontConfig initialized. Found %d fonts", set?set->nfont:0);
if(!set || !set->nfont) {
@@ -538,7 +532,7 @@ DisplayFontParam *GFXGlobalParams::getDisplayFont(GString *fontName)
const char*bestfilename = 0;
#ifndef HAVE_FONTCONFIG
- /* if we don't have fontconfig, try a simple approach */
+ /* if we don't have fontconfig, try a simple filename-comparison approach */
fontfile_t*f = global_fonts;
while(f) {
if(strstr(f->filename, name)) {
@@ -607,7 +601,6 @@ GFXOutputDev::GFXOutputDev(InfoOutputDev*info, PDFDoc*doc)
this->config_extrafontdata = 0;
this->config_optimize_polygons = 0;
this->config_multiply = 1;
- this->dashPattern = 0;
this->page2page = 0;
this->num_pages = 0;
@@ -798,6 +791,31 @@ void dump_outline(gfxline_t*line)
}
}
+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;sgetX(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();
@@ -1063,7 +1081,6 @@ void GFXOutputDev::endPage()
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 */
}
@@ -1095,16 +1112,21 @@ void GFXOutputDev::strokeGfxline(GfxState *state, gfxline_t*line, int flags)
if(lineCap == 0) capType = gfx_capButt;
else if(lineCap == 1) capType = gfx_capRound;
else if(lineCap == 2) capType = gfx_capSquare;
+ else msg(" 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(" 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
@@ -1115,26 +1137,33 @@ void GFXOutputDev::strokeGfxline(GfxState *state, gfxline_t*line, int flags)
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(" %d dashes", this->dashLength);
- msg(" | phase: %f", this->dashStart);
- for(t=0;tdashLength;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(" %d dashes", dashLength);
+ msg(" | phase: %f", dashStart);
+ for(t=0;t | d%-3d: %f", t, this->dashPattern[t]);
+ }
+ msg(" | 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(" After dashing:");
}
@@ -1143,8 +1172,8 @@ void GFXOutputDev::strokeGfxline(GfxState *state, gfxline_t*line, int flags)
msg(" 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);
@@ -1262,9 +1291,6 @@ void GFXOutputDev::finish()
GFXOutputDev::~GFXOutputDev()
{
finish();
- if(this->dashPattern) {
- free(this->dashPattern);this->dashPattern = 0;
- }
};
GBool GFXOutputDev::upsideDown()
{
@@ -1334,7 +1360,6 @@ void GFXOutputDev::beginString(GfxState *state, GString *s)
if(current_text_stroke) {
msg(" Error: Incompatible change of text rendering to %d while inside cliptext", render);
}
-
msg(" beginString(%s) render=%d", makeStringPrintable(s->getCString()), render);
}
@@ -1369,7 +1394,7 @@ void GFXOutputDev::drawChar(GfxState *state, double x, double y,
// check for invisible text -- this is used by Acrobat Capture
if (render == RENDER_INVISIBLE) {
- col.a = 255;
+ col.a = 0;
if(!config_extrafontdata)
return;
}
@@ -1383,11 +1408,12 @@ void GFXOutputDev::drawChar(GfxState *state, double x, double y,
}
Unicode u = uLen?(_u[0]):0;
- msg(" 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;
+
+ 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);
if(render == RENDER_FILL || render == RENDER_INVISIBLE) {
device->drawchar(device, current_gfxfont, glyphid, &col, &m);
@@ -1545,6 +1571,11 @@ void GFXOutputDev::startPage(int pageNum, GfxState *state, double crop_x1, doubl
/*if(user_clipy1 > y1)*/ y1 = user_clipy1;
/*if(user_clipy2 < y2)*/ y2 = user_clipy2;
msg(" Using user clip box %f/%f/%f/%f",x1,y1,x2,y2);
+ } else {
+ x1 += this->clipmovex;
+ y1 += this->clipmovey;
+ x2 += this->clipmovex;
+ y2 += this->clipmovey;
}
//msg(" Bounding box is (%f,%f)-(%f,%f) [shifted by %d/%d]", x1,y1,x2,y2, user_movex, user_movey);
@@ -1567,9 +1598,9 @@ void GFXOutputDev::startPage(int pageNum, GfxState *state, double crop_x1, doubl
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;
}
@@ -1633,7 +1664,8 @@ void GFXOutputDev::processLink(Link *link, Catalog *catalog)
LinkDest *dest=NULL;
if (ha->getDest()==NULL)
dest=catalog->findDest(ha->getNamedDest());
- else dest=ha->getDest();
+ else
+ dest=ha->getDest()->copy();
if (dest){
if (dest->isPageRef()){
Ref pageref=dest->getPageRef();
@@ -1642,6 +1674,7 @@ void GFXOutputDev::processLink(Link *link, Catalog *catalog)
else page=dest->getPageNum();
sprintf(buf, "%d", page);
s = strdup(buf);
+ delete dest;
}
}
break;
@@ -1778,6 +1811,10 @@ void GFXOutputDev::saveState(GfxState *state) {
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) {
@@ -1793,6 +1830,14 @@ 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) {
@@ -1809,18 +1854,25 @@ void GFXOutputDev::restoreState(GfxState *state) {
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(" updateLineDash, %d dashes", this->dashLength);
- if(!this->dashLength) {
- this->dashPattern = 0;
+ int dashLength;
+ double dashStart;
+ state->getLineDash(&pattern, &dashLength, &dashStart);
+ msg(" 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;
}
}
@@ -2461,7 +2513,7 @@ void addGlobalFont(const char*filename)
}
f->len = len;
- msg(" Adding font \"%s\".", filename);
+ msg(" Adding font \"%s\".", filename);
if(global_fonts_next) {
global_fonts_next->next = f;
global_fonts_next = global_fonts_next->next;
@@ -2492,13 +2544,13 @@ void addGlobalLanguageDir(const char*dir)
void addGlobalFontDir(const char*dirname)
{
#ifdef HAVE_DIRENT_H
- msg(" Adding %s to font directories", dirname);
DIR*dir = opendir(dirname);
if(!dir) {
msg(" Couldn't open directory %s", dirname);
return;
}
struct dirent*ent;
+ int fonts = 0;
while(1) {
ent = readdir (dir);
if (!ent)
@@ -2522,22 +2574,14 @@ void addGlobalFontDir(const char*dirname)
strcat(fontname, dirseparator());
strcat(fontname, name);
addGlobalFont(fontname);
+ fonts++;
}
}
+ msg(" Added %s to font directories (%d fonts)", dirname, fonts);
closedir(dir);
#else
msg(" No dirent.h");
#endif
-
- fontfile_t* f = (fontfile_t*)malloc(sizeof(fontfile_t));
- memset(f, 0, sizeof(fontfile_t));
- f->filename = dirname;
- if(global_fontdirs_next) {
- global_fontdirs_next->next = f;
- global_fontdirs_next = global_fontdirs_next->next;
- } else {
- global_fontdirs_next = global_fontdirs = f;
- }
}
void GFXOutputDev::beginTransparencyGroup(GfxState *state, double *bbox,
@@ -2579,9 +2623,9 @@ void GFXOutputDev::endTransparencyGroup(GfxState *state)
this->device = states[statepos].olddevice;
if(!this->device) {
- msg(" 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 */
+ msg(" Bad state nesting in transparency group");
+ msg(" Notice: this is a known problem, which will be fixed in 0.9.1");
+ msg(" In the meantime, please convert the file with -s poly2bitmap");
restoreState(state);
this->device = states[statepos].olddevice;
}