X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fpdf%2Fxpdf-changes.patch;h=f7ff2fdf27b7c1ebf28dfaba9c8add22ef5af2ed;hb=6f752003d958028263b5c07c422eaad0e7ec4390;hp=c45213a9ea1473015340e2e381780124119c2221;hpb=5f07a6639c42c5e9401387257cf3d8f6b2aa8513;p=swftools.git diff --git a/lib/pdf/xpdf-changes.patch b/lib/pdf/xpdf-changes.patch index c45213a..f7ff2fd 100644 --- a/lib/pdf/xpdf-changes.patch +++ b/lib/pdf/xpdf-changes.patch @@ -39,6 +39,24 @@ diff -u -r1.9 -r1.10 } Gfx::Gfx(XRef *xrefA, OutputDev *outA, Dict *resDict, +@@ -3783,6 +3789,7 @@ + pushResources(resDict); + + // save current graphics state ++ GfxState*mystate = state; + saveState(); + + // kill any pre-existing path +@@ -3848,6 +3855,9 @@ + + // restore graphics state + restoreState(); ++ if(state!=mystate) { ++ fprintf(stderr, "Invalid state nesting in PDF file- file broken?\n"); ++ } + + // pop resource stack + popResources(); Index: GfxFont.h =================================================================== RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/GfxFont.h,v @@ -134,6 +152,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 @@ -172,16 +201,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); @@ -205,15 +244,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); @@ -443,7 +487,7 @@ diff -u -r1.7 -r1.8 #include #include Index: config.h ---- config.h.orig 2007-09-09 12:11:20.000000000 +0200 +--- config.h 2007-09-09 12:11:20.000000000 +0200 +++ config.h 2007-09-09 12:11:40.000000000 +0200 @@ -53,9 +53,9 @@ @@ -580,6 +624,17 @@ 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 +@@ -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: @@ -594,7 +649,7 @@ diff -u -r1.5 -r1.6 //----- 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:07:22.000000000 +0100 +++ SplashOutputDev.h 2006-11-12 12:08:48.000000000 +0100 @@ -70,7 +70,7 @@ //----- initialization and control @@ -605,7 +660,7 @@ diff -u -r1.5 -r1.6 // End a page. virtual void endPage(); ---- SplashOutputDev.cc.orig 2006-11-12 12:07:06.000000000 +0100 +--- 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; @@ -616,7 +671,7 @@ diff -u -r1.5 -r1.6 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:23:01.000000000 +0100 +++ TextOutputDev.h 2006-11-12 12:25:31.000000000 +0100 @@ -578,7 +578,7 @@ //----- initialization and control @@ -627,7 +682,7 @@ 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:22:53.000000000 +0100 +++ TextOutputDev.cc 2006-11-12 12:25:03.000000000 +0100 @@ -3805,7 +3805,7 @@ } @@ -638,7 +693,7 @@ diff -u -r1.5 -r1.6 text->startPage(state); } ---- CoreOutputDev.cc.orig 2006-11-12 12:21:59.000000000 +0100 +--- CoreOutputDev.cc 2006-11-12 12:21:59.000000000 +0100 +++ CoreOutputDev.cc 2006-11-12 12:23:29.000000000 +0100 @@ -57,5 +57,5 @@ @@ -659,3 +714,233 @@ diff -u -r1.5 -r1.6 #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 + 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; + } + + void SplashFont::initCache() { +--- xpdf/SplashFTFont.cc.orig 2008-09-09 21:31:01.000000000 +0200 ++++ xpdf/SplashFTFont.cc 2008-10-05 17:37:32.000000000 +0200 +@@ -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); +@@ -268,6 +281,8 @@ + 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; +--- 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); +