X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Fpdf%2Fxpdf-changes.patch;h=9068a678de3521a37759999ffb272d97662958c2;hp=020ce3ddc648fd5db1fabdfd95c5442179eb0bb4;hb=2391d7ae5d8a145a250a8b80ab8c93ba74eba030;hpb=f3bc04e70501213ea1d9d2aa22d5c2fa550dab3f diff --git a/lib/pdf/xpdf-changes.patch b/lib/pdf/xpdf-changes.patch index 020ce3d..9068a67 100644 --- a/lib/pdf/xpdf-changes.patch +++ b/lib/pdf/xpdf-changes.patch @@ -6,13 +6,15 @@ retrieving revision 1.10 diff -u -r1.9 -r1.10 --- Gfx.cc 3 Dec 2005 10:11:33 -0000 1.9 +++ Gfx.cc 3 Dec 2005 10:30:41 -0000 1.10 -@@ -439,7 +439,9 @@ +@@ -439,7 +439,11 @@ fontChanged = gFalse; clip = clipNone; ignoreUndef = 0; - out->startPage(pageNum, state); + if(cropBox) { + out->startPage(pageNum, state, cropBox->x1,cropBox->y1,cropBox->x2,cropBox->y2); ++ } else { ++ out->startPage(pageNum, state, 0,0,0,0); + } out->setDefaultCTM(state->getCTM()); out->updateAll(state); @@ -132,6 +134,17 @@ diff -u -r1.10 -r1.12 sizeof(GfxColorComp)); for (i = 0; i <= maxPixel; ++i) { lookup[k][i] = dblToCol(decodeLow[k] + +@@ -3754,7 +3769,10 @@ + } + + void GfxState::setPath(GfxPath *pathA) { ++ if(pathA) { ++ if(path) + delete path; ++ } + path = pathA; + } + Index: GlobalParams.cc =================================================================== RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/GlobalParams.cc,v @@ -170,16 +183,26 @@ diff -u -r1.4 -r1.7 line = 1; while (getLine(buf, sizeof(buf) - 1, f)) { -@@ -659,6 +682,32 @@ - } +@@ -1142,6 +1165,42 @@ + deleteGList(tokens, GString); } ++static char is_absolute(char*filename) ++{ ++ int l = strlen(filename); ++ if(filename[0] == '/' || filename[0] == '\\') ++ return 1; ++ if(l>2 && filename[1]==':' && (filename[2]=='\\' || filename[2]=='/')) ++ return 1; ++ return 0; ++} ++ +static GString* qualify_filename(GString*path, GString*filename) +{ + GString*fullpath = 0; + char*prefix = "/usr/local/share/xpdf/"; + -+ if (filename->getChar(0) != '\\' && filename->getChar(0) != '/') { ++ if (!is_absolute(filename->getCString())) { + /* relative path */ + fullpath = path->copy(); + fullpath->append(filename); @@ -203,15 +226,20 @@ diff -u -r1.4 -r1.7 void GlobalParams::parseNameToUnicode(GList *tokens, GString *fileName, int line) { GString *name; -@@ -673,7 +722,7 @@ +@@ -1156,10 +1215,10 @@ fileName->getCString(), line); return; } - name = (GString *)tokens->get(1); + name = qualify_filename(this->path, (GString *)tokens->get(1)); if (!(f = fopen(name->getCString(), "r"))) { - error(-1, "Couldn't open 'nameToUnicode' file '%s'", - name->getCString()); +- error(-1, "Couldn't open 'nameToUnicode' file '%s'", +- name->getCString()); ++ error(-1, "Couldn't open 'nameToUnicode' file '%s' using path '%s'", ++ name->getCString(), path->getCString()); + return; + } + line2 = 1; @@ -705,10 +754,12 @@ } collection = (GString *)tokens->get(1); @@ -440,47 +468,373 @@ diff -u -r1.7 -r1.8 #endif #include #include -Index: config.h +Index: gfile.h =================================================================== -RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/config.h,v +RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/gfile.h,v +retrieving revision 1.9 +retrieving revision 1.10 +diff -u -r1.9 -r1.10 +--- gfile.h 3 Dec 2005 10:11:33 -0000 1.9 ++++ gfile.h 3 Dec 2005 10:30:41 -0000 1.10 +@@ -58,6 +58,9 @@ + // Get current directory. + extern GString *getCurrentDir(); + ++/* create a temporary filename */ ++char* mktmpname(char*ptr); ++ + // Append a file name to a path string. may be an empty + // string, denoting the current directory). Returns . + extern GString *appendToPath(GString *path, char *fileName); +Index: GlobalParams.h +=================================================================== +RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/GlobalParams.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 ---- config.h 3 Dec 2005 10:11:33 -0000 1.5 -+++ config.h 3 Dec 2005 10:30:41 -0000 1.6 -@@ -53,18 +53,18 @@ - - // user config file name, relative to the user's home directory - #if defined(VMS) || (defined(WIN32) && !defined(__CYGWIN32__)) --#define xpdfUserConfigFile "xpdfrc" -+#define xpdfUserConfigFile "pdf2swf.conf" - #else --#define xpdfUserConfigFile ".xpdfrc" -+#define xpdfUserConfigFile ".pdf2swf.conf" +--- GlobalParams.h 2006-10-10 19:54:29.000000000 +0200 ++++ GlobalParams.h 2006-11-12 11:19:40.000000000 +0100 +@@ -213,8 +213,8 @@ + FILE *getUnicodeMapFile(GString *encodingName); + FILE *findCMapFile(GString *collection, GString *cMapName); + FILE *findToUnicodeFile(GString *name); +- DisplayFontParam *getDisplayFont(GString *fontName); +- DisplayFontParam *getDisplayCIDFont(GString *fontName, GString *collection); ++ virtual DisplayFontParam *getDisplayFont(GString *fontName); ++ virtual DisplayFontParam *getDisplayCIDFont(GString *fontName, GString *collection); + GString *getPSFile(); + int getPSPaperWidth(); + int getPSPaperHeight(); +@@ -218,1 +218,1 @@ +- void parseFile(GString *fileName, FILE *f); ++public: void parseFile(GString *fileName, FILE *f); private: +@@ -246,6 +246,10 @@ + GBool loadPlugin(char *type, char *name); #endif - // system config file name (set via the configure script) --#ifdef SYSTEM_XPDFRC --#define xpdfSysConfigFile SYSTEM_XPDFRC -+#ifndef WIN32 -+#define xpdfSysConfigFile "/etc/pdf2swf.conf" ++ //----- config file base path ++ ++ GString*path; ++ + //----- static tables + + NameToCharCode * // mapping from char name to +--- SplashOutputDev.h 2006-11-12 12:07:22.000000000 +0100 ++++ SplashOutputDev.h 2006-11-12 12:08:48.000000000 +0100 +@@ -70,7 +70,7 @@ + //----- initialization and control + + // Start a page. +- virtual void startPage(int pageNum, GfxState *state); ++ virtual void startPage(int pageNum, GfxState *state, double x1,double y1,double x2,double y2); + + // End a page. + virtual void endPage(); +--- SplashOutputDev.cc 2006-11-12 12:07:06.000000000 +0100 ++++ SplashOutputDev.cc 2006-11-12 12:09:36.000000000 +0100 +@@ -696,7 +696,7 @@ + nT3Fonts = 0; + } + +-void SplashOutputDev::startPage(int pageNum, GfxState *state) { ++void SplashOutputDev::startPage(int pageNum, GfxState *state, double x1,double y1,double x2,double y2) { + int w, h; + double *ctm; + SplashCoord mat[6]; +--- TextOutputDev.cc 2006-11-12 12:22:53.000000000 +0100 ++++ TextOutputDev.cc 2006-11-12 12:25:03.000000000 +0100 +@@ -3805,7 +3805,7 @@ + } + } + +-void TextOutputDev::startPage(int pageNum, GfxState *state) { ++void TextOutputDev::startPage(int pageNum, GfxState *state, double x1,double y1,double x2,double y2) { + text->startPage(state); + } + +--- CoreOutputDev.cc 2006-11-12 12:21:59.000000000 +0100 ++++ CoreOutputDev.cc 2006-11-12 12:23:29.000000000 +0100 +@@ -57,5 +57,5 @@ + + void CoreOutputDev::clear() { + startDoc(NULL); +- startPage(0, NULL); ++ startPage(0, NULL, 0,0,0,0); + } +--- SplashFTFontEngine.cc 2006-11-19 22:30:44.000000000 +0100 ++++ SplashFTFontEngine.cc 2006-11-19 22:30:56.000000000 +0100 +@@ -13,9 +13,7 @@ + #endif + + #include +-#ifndef WIN32 + # include +-#endif + #include "gmem.h" + #include "GString.h" + #include "gfile.h" +--- SplashOutputDev.cc 2007-09-09 12:29:45.000000000 +0200 ++++ SplashOutputDev.cc 2007-09-09 12:30:02.000000000 +0200 +@@ -13,6 +13,7 @@ + #endif + + #include ++#include + #include + #include "gfile.h" + #include "GlobalParams.h" +--- SplashFontFile.cc 2007-09-09 12:33:00.000000000 +0200 ++++ SplashFontFile.cc 2007-09-09 12:33:07.000000000 +0200 +@@ -11,9 +11,7 @@ + #endif + + #include +-#ifndef WIN32 +-# include +-#endif ++#include + #include "GString.h" + #include "SplashFontFile.h" + #include "SplashFontFileID.h" +--- xpdf/SplashFont.h.orig 2008-09-09 21:31:01.000000000 +0200 ++++ xpdf/SplashFont.h 2008-10-05 17:36:44.000000000 +0200 +@@ -73,6 +73,9 @@ + virtual GBool makeGlyph(int c, int xFrac, int yFrac, + SplashGlyphBitmap *bitmap) = 0; + ++ // return the number of characters in this font ++ virtual int getNumChars() = 0; ++ + // Return the path for a glyph. + virtual SplashPath *getGlyphPath(int c) = 0; + +@@ -83,6 +86,9 @@ + void getBBox(int *xMinA, int *yMinA, int *xMaxA, int *yMaxA) + { *xMinA = xMin; *yMinA = yMin; *xMaxA = xMax; *yMaxA = yMax; } + ++ double ascender; ++ double descender; ++ double last_advance; //set after getGlyphPath() + protected: + + SplashFontFile *fontFile; +--- orig/GfxFont.h 2007-07-28 00:11:06.000000000 +0200 ++++ GfxFont.h 2007-09-09 18:31:31.000000000 +0200 +@@ -164,6 +164,7 @@ + virtual int getNextChar(char *s, int len, CharCode *code, + Unicode *u, int uSize, int *uLen, + double *dx, double *dy, double *ox, double *oy) = 0; ++ virtual CharCodeToUnicode* getCTU() = 0; + + protected: + +@@ -204,6 +205,7 @@ + virtual int getNextChar(char *s, int len, CharCode *code, + Unicode *u, int uSize, int *uLen, + double *dx, double *dy, double *ox, double *oy); ++ virtual CharCodeToUnicode* getCTU(); + + // Return the encoding. + char **getEncoding() { return enc; } +@@ -266,6 +268,7 @@ + virtual int getNextChar(char *s, int len, CharCode *code, + Unicode *u, int uSize, int *uLen, + double *dx, double *dy, double *ox, double *oy); ++ virtual CharCodeToUnicode* getCTU(); + + // Return the writing mode (0=horizontal, 1=vertical). + virtual int getWMode(); +--- orig/GfxFont.cc 2007-07-28 00:11:06.000000000 +0200 ++++ GfxFont.cc 2007-09-09 18:33:37.000000000 +0200 +@@ -925,6 +925,10 @@ + return 1; + } + ++CharCodeToUnicode* Gfx8BitFont::getCTU() { ++ return ctu; ++} ++ + CharCodeToUnicode *Gfx8BitFont::getToUnicode() { + ctu->incRefCnt(); + return ctu; +@@ -1417,6 +1421,10 @@ + } + } + ++CharCodeToUnicode* GfxCIDFont::getCTU() { ++ return ctu; ++} ++ + int GfxCIDFont::getNextChar(char *s, int len, CharCode *code, + Unicode *u, int uSize, int *uLen, + double *dx, double *dy, double *ox, double *oy) { +--- OutputDev.h Sat Jul 28 00:11:08 2007 ++++ OutputDev.h Sun Sep 9 13:50:40 2007 +@@ -17,6 +17,7 @@ + + #include "gtypes.h" + #include "CharTypes.h" ++#include "Object.h" + + class GString; + class Gfx; +--- SplashOutputDev.h 2007-10-20 13:17:02.000000000 +0200 ++++ SplashOutputDev.h 2007-10-20 13:17:23.000000000 +0200 +@@ -206,6 +206,7 @@ + virtual void setVectorAntialias(GBool vaa); + #endif + ++ void doUpdateFont(GfxState *state); + private: + + void setupScreenParams(double hDPI, double vDPI); +@@ -215,7 +216,6 @@ + SplashPattern *getColor(GfxGray gray, GfxRGB *rgb); + #endif + SplashPath *convertPath(GfxState *state, GfxPath *path); +- void doUpdateFont(GfxState *state); + void drawType3Glyph(T3FontCache *t3Font, + T3FontCacheTag *tag, Guchar *data); + static GBool imageMaskSrc(void *data, SplashColorPtr line); +--- xpdf/GlobalParams.h 2007-10-20 13:18:03.000000000 +0200 ++++ xpdf/GlobalParams.h 2007-10-20 13:25:52.000000000 +0200 +@@ -196,7 +196,7 @@ + // file. + GlobalParams(char *cfgFileName); + +- ~GlobalParams(); ++ virtual ~GlobalParams(); + + void setBaseDir(char *dir); + void setupBaseFonts(char *dir); +--- xpdf/SplashOutputDev.h.orig 2007-10-21 17:43:29.000000000 +0200 ++++ xpdf/SplashOutputDev.h 2007-11-19 10:07:27.000000000 +0100 +@@ -197,6 +197,8 @@ + #endif + + void doUpdateFont(GfxState *state); ++ ++ SplashPath *convertPath(GfxState *state, GfxPath *path); + private: + + void setupScreenParams(double hDPI, double vDPI); +@@ -205,7 +207,6 @@ #else - // under Windows, we get the directory with the executable and then - // append this file name --#define xpdfSysConfigFile "xpdfrc" -+#define xpdfSysConfigFile "pdf2swf.conf" + SplashPattern *getColor(GfxGray gray, GfxRGB *rgb); #endif +- SplashPath *convertPath(GfxState *state, GfxPath *path); + void drawType3Glyph(T3FontCache *t3Font, + T3FontCacheTag *tag, Guchar *data); + static GBool imageMaskSrc(void *data, SplashColorPtr line); +--- xpdf/SplashFont.cc.orig 2008-09-09 21:31:01.000000000 +0200 ++++ xpdf/SplashFont.cc 2008-10-05 17:37:08.000000000 +0200 +@@ -48,6 +48,10 @@ + cacheTags = NULL; + + xMin = yMin = xMax = yMax = 0; ++ ++ last_advance = -1; ++ ascender = -1; ++ descender = -1; + } - //------------------------------------------------------------------------ -Index: gfile.cc -=================================================================== -RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/gfile.cc,v -retrieving revision 1.12 -retrieving revision 1.13 -diff -u -r1.12 -r1.13 ---- gfile.cc 3 Dec 2005 10:11:33 -0000 1.12 -+++ gfile.cc 3 Dec 2005 10:30:41 -0000 1.13 -@@ -437,6 +437,52 @@ + void SplashFont::initCache() { +--- xpdf/SplashFTFont.cc.orig 2009-03-08 17:19:08.000000000 +0100 ++++ xpdf/SplashFTFont.cc 2009-03-15 19:18:11.000000000 +0100 +@@ -46,6 +46,7 @@ + int x, y; + + face = fontFileA->face; ++ + if (FT_New_Size(face, &sizeObj)) { + return; + } +@@ -54,6 +55,10 @@ + if (FT_Set_Pixel_Sizes(face, 0, (int)size)) { + return; + } ++ ++ this->ascender = face->ascender; ++ this->descender = face->descender; ++ + // if the textMat values are too small, FreeType's fixed point + // arithmetic doesn't work so well + textScale = splashSqrt(textMat[2]*textMat[2] + textMat[3]*textMat[3]) / size; +@@ -228,6 +233,12 @@ + GBool needClose; + }; + ++int SplashFTFont::getNumChars() ++{ ++ SplashFTFontFile* ff = (SplashFTFontFile *)fontFile; ++ return ff->face->num_glyphs; ++} ++ + SplashPath *SplashFTFont::getGlyphPath(int c) { + static FT_Outline_Funcs outlineFuncs = { + #if FREETYPE_MINOR <= 1 +@@ -249,6 +260,8 @@ + FT_UInt gid; + FT_Glyph glyph; + ++ this->last_advance = -1; ++ + ff = (SplashFTFontFile *)fontFile; + ff->face->size = sizeObj; + FT_Set_Transform(ff->face, &textMatrix, NULL); +@@ -262,17 +275,24 @@ + // skip the TrueType notdef glyph + return NULL; + } +- if (FT_Load_Glyph(ff->face, gid, FT_LOAD_NO_BITMAP)) { ++ int error = 0; ++ if ((error=FT_Load_Glyph(ff->face, gid, FT_LOAD_NO_BITMAP|FT_LOAD_NO_HINTING))) { ++ fprintf(stderr, "Truetype wasn't able to load glyph %d, error %d\n", gid, error); + return NULL; + } + if (FT_Get_Glyph(slot, &glyph)) { + return NULL; + } ++ this->last_advance = glyph->advance.x/65536.0; ++ + path.path = new SplashPath(); + path.textScale = textScale; + path.needClose = gFalse; +- FT_Outline_Decompose(&((FT_OutlineGlyph)glyph)->outline, ++ error = FT_Outline_Decompose(&((FT_OutlineGlyph)glyph)->outline, + &outlineFuncs, &path); ++ if(error) { ++ fprintf(stderr, "Truetype wasn't able to read glyph %d, error %d\n", gid, error); ++ } + if (path.needClose) { + path.path->close(); + } +--- xpdf/SplashFTFont.h.orig 2008-09-09 21:31:01.000000000 +0200 ++++ xpdf/SplashFTFont.h 2008-10-04 17:39:57.000000000 +0200 +@@ -42,6 +42,9 @@ + virtual GBool makeGlyph(int c, int xFrac, int yFrac, + SplashGlyphBitmap *bitmap); + ++ // return the number of characters in this font ++ virtual int getNumChars(); ++ + // Return the path for a glyph. + virtual SplashPath *getGlyphPath(int c); + +--- xpdf/SplashScreen.cc.orig 2008-10-06 17:59:44.000000000 +0200 ++++ xpdf/SplashScreen.cc 2008-10-06 18:20:09.000000000 +0200 +@@ -363,6 +363,8 @@ + int SplashScreen::test(int x, int y, Guchar value) { + int xx, yy; + ++ return 1; ++ + if (value < minVal) { + return 0; + } +--- xpdf/gfile.cc.orig 2007-02-27 23:05:51.000000000 +0100 ++++ xpdf/gfile.cc 2008-10-12 15:15:22.000000000 +0200 +@@ -439,6 +439,52 @@ #endif } @@ -516,7 +870,7 @@ diff -u -r1.12 -r1.13 + // used to be mktemp. This does remove the warnings, but + // It's not exactly an improvement. +#ifdef HAVE_LRAND48 -+ sprintf(ptr, "%s%s%08x%08x",dir,sep,lrand48(),lrand48()); ++ sprintf(ptr, "%s%s%08x%08x",dir,sep,(unsigned int)lrand48(),(unsigned int)lrand48()); +#else +# ifdef HAVE_RAND + sprintf(ptr, "%s%s%08x%08x",dir,sep,rand(),rand()); @@ -533,7 +887,34 @@ diff -u -r1.12 -r1.13 GBool openTempFile(GString **name, FILE **f, char *mode, char *ext) { #if defined(WIN32) //---------- Win32 ---------- -@@ -463,7 +509,7 @@ +@@ -460,7 +506,7 @@ + s->append("x"); + t = (int)time(NULL); + for (i = 0; i < 1000; ++i) { +- sprintf(buf, "%d", t + i); ++ sprintf(buf, "%08x-%08x", t + i, GetCurrentThreadId()); + s2 = s->copy()->append(buf); + if (ext) { + s2->append(ext); +@@ -468,8 +514,7 @@ + if (!(f2 = fopen(s2->getCString(), "r"))) { + if (!(f2 = fopen(s2->getCString(), mode))) { + delete s2; +- delete s; +- return gFalse; ++ continue; + } + *name = s2; + *f = f2; +@@ -479,6 +524,7 @@ + fclose(f2); + delete s2; + } ++ fprintf(stderr, "Couldn't create temporary file\n"); + delete s; + return gFalse; + #elif defined(VMS) || defined(__EMX__) || defined(ACORN) || defined(MACOS) +@@ -489,7 +535,7 @@ // with this file name after the tmpnam call and before the fopen // call. I will happily accept fixes to this function for non-Unix // OSs. @@ -542,7 +923,7 @@ diff -u -r1.12 -r1.13 return gFalse; } *name = new GString(s); -@@ -490,7 +536,7 @@ +@@ -516,7 +562,7 @@ (*name)->append("/XXXXXX")->append(ext); fd = mkstemps((*name)->getCString(), strlen(ext)); #else @@ -551,7 +932,7 @@ diff -u -r1.12 -r1.13 return gFalse; } *name = new GString(s); -@@ -507,7 +553,7 @@ +@@ -533,7 +579,7 @@ (*name)->append("/XXXXXX"); fd = mkstemp((*name)->getCString()); #else // HAVE_MKSTEMP @@ -560,71 +941,51 @@ diff -u -r1.12 -r1.13 return gFalse; } *name = new GString(s); -Index: gfile.h -=================================================================== -RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/gfile.h,v -retrieving revision 1.9 -retrieving revision 1.10 -diff -u -r1.9 -r1.10 ---- gfile.h 3 Dec 2005 10:11:33 -0000 1.9 -+++ gfile.h 3 Dec 2005 10:30:41 -0000 1.10 -@@ -58,6 +58,9 @@ - // Get current directory. - extern GString *getCurrentDir(); - -+/* create a temporary filename */ -+char* mktmpname(char*ptr); -+ - // Append a file name to a path string. may be an empty - // string, denoting the current directory). Returns . - extern GString *appendToPath(GString *path, char *fileName); -Index: GlobalParams.h -=================================================================== -RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/GlobalParams.h,v -retrieving revision 1.5 -retrieving revision 1.6 -diff -u -r1.5 -r1.6 ---- GlobalParams.h 2006-10-10 19:54:29.000000000 +0200 -+++ GlobalParams.h 2006-11-12 11:19:40.000000000 +0100 -@@ -218,1 +218,1 @@ -- void parseFile(GString *fileName, FILE *f); -+public: void parseFile(GString *fileName, FILE *f); private: -@@ -246,6 +246,10 @@ - GBool loadPlugin(char *type, char *name); - #endif - -+ //----- config file base path -+ -+ GString*path; -+ - //----- static tables - - NameToCharCode * // mapping from char name to ---- SplashOutputDev.h.orig 2006-11-12 12:07:22.000000000 +0100 -+++ SplashOutputDev.h 2006-11-12 12:08:48.000000000 +0100 -@@ -70,7 +70,7 @@ - //----- initialization and control +--- xpdf/Gfx.cc.orig 2009-03-08 17:10:40.000000000 +0100 ++++ xpdf/Gfx.cc 2009-03-08 17:18:23.000000000 +0100 +@@ -3188,8 +3188,11 @@ + u, (int)(sizeof(u) / sizeof(Unicode)), &uLen, + &dx, &dy, &originX, &originY); + dx = dx * state->getFontSize() + state->getCharSpace(); +- if (n == 1 && *p == ' ') { +- dx += state->getWordSpace(); ++ if (n == 1 && (*p == ' ' || *p == 0)) { ++ double w=state->getWordSpace(); ++ if (w==0 && dx==0) ++ w=state->getFontSize()/3; // workaround for zero word space ++ dx += w; + } + dx *= state->getHorizScaling(); + dy *= state->getFontSize(); +@@ -3824,6 +3833,7 @@ + out->beginTransparencyGroup(state, bbox, blendingColorSpace, + isolated, knockout, softMask); + } ++ GfxState*old_state = state; - // Start a page. -- virtual void startPage(int pageNum, GfxState *state); -+ virtual void startPage(int pageNum, GfxState *state, double x1,double y1,double x2,double y2); + // set new base matrix + for (i = 0; i < 6; ++i) { +@@ -3835,6 +3845,9 @@ + display(str, gFalse); + + if (softMask || transpGroup) { ++ // restore graphics state ++ while(state != old_state) ++ restoreState(); + out->endTransparencyGroup(state); + } - // End a page. - virtual void endPage(); ---- SplashOutputDev.cc.orig 2006-11-12 12:07:06.000000000 +0100 -+++ SplashOutputDev.cc 2006-11-12 12:09:36.000000000 +0100 -@@ -696,7 +696,7 @@ - nT3Fonts = 0; - } +--- TextOutputDev.h.orig 2009-10-07 17:00:29.000000000 -0700 ++++ TextOutputDev.h 2009-10-07 17:01:50.000000000 -0700 +@@ -170,6 +170,7 @@ + friend class TextFlow; + friend class TextWordList; + friend class TextPage; ++ friend class XMLOutputDev; + }; --void SplashOutputDev::startPage(int pageNum, GfxState *state) { -+void SplashOutputDev::startPage(int pageNum, GfxState *state, double x1,double y1,double x2,double y2) { - int w, h; - double *ctm; - SplashCoord mat[6]; ---- TextOutputDev.h.orig 2006-11-12 12:23:01.000000000 +0100 -+++ TextOutputDev.h 2006-11-12 12:25:31.000000000 +0100 -@@ -578,7 +578,7 @@ + //------------------------------------------------------------------------ +@@ -578,7 +579,7 @@ //----- initialization and control // Start a page. @@ -633,46 +994,3 @@ diff -u -r1.5 -r1.6 // End a page. virtual void endPage(); ---- TextOutputDev.cc.orig 2006-11-12 12:22:53.000000000 +0100 -+++ TextOutputDev.cc 2006-11-12 12:25:03.000000000 +0100 -@@ -3805,7 +3805,7 @@ - } - } - --void TextOutputDev::startPage(int pageNum, GfxState *state) { -+void TextOutputDev::startPage(int pageNum, GfxState *state, double x1,double y1,double x2,double y2) { - text->startPage(state); - } - ---- CoreOutputDev.cc.orig 2006-11-12 12:21:59.000000000 +0100 -+++ CoreOutputDev.cc 2006-11-12 12:23:29.000000000 +0100 -@@ -57,5 +57,5 @@ - - void CoreOutputDev::clear() { - startDoc(NULL); -- startPage(0, NULL); -+ startPage(0, NULL, 0,0,0,0); - } ---- SplashFTFontEngine.cc 2006-11-19 22:30:44.000000000 +0100 -+++ SplashFTFontEngine.cc 2006-11-19 22:30:56.000000000 +0100 -@@ -13,9 +13,7 @@ - #endif - - #include --#ifndef WIN32 - # include --#endif - #include "gmem.h" - #include "GString.h" - #include "gfile.h" ---- xpdf/pdftoppm.cc.orig 2007-03-07 18:00:34.000000000 +0100 -+++ xpdf/pdftoppm.cc 2007-03-07 18:00:41.000000000 +0100 -@@ -179,7 +179,7 @@ - splashOut->startDoc(doc->getXRef()); - for (pg = firstPage; pg <= lastPage; ++pg) { - doc->displayPage(splashOut, pg, resolution, resolution, 0, -- gFalse, gTrue, gFalse); -+ /*usemediabox*/gTrue, gTrue, gFalse); - sprintf(ppmFile, "%.*s-%06d.%s", - (int)sizeof(ppmFile) - 32, ppmRoot, pg, - mono ? "pbm" : gray ? "pgm" : "ppm");