X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fpdf%2Fxpdf-changes.patch;h=47720ae3e865d29d29a1b44d779a523f2502b6ef;hb=6a529bfa890997a55fec9ae0e0d388cf9d5276c2;hp=74407485cca5f850b788d60e35704c8e529fabda;hpb=def220a7c042291823ebdc97055c18789964b2d9;p=swftools.git diff --git a/lib/pdf/xpdf-changes.patch b/lib/pdf/xpdf-changes.patch index 7440748..47720ae 100644 --- a/lib/pdf/xpdf-changes.patch +++ b/lib/pdf/xpdf-changes.patch @@ -1,24 +1,3 @@ -Index: FoFiType1C.cc -=================================================================== -RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/FoFiType1C.cc,v -retrieving revision 1.3 -retrieving revision 1.4 -diff -u -r1.3 -r1.4 ---- FoFiType1C.cc 3 Dec 2005 10:11:33 -0000 1.3 -+++ FoFiType1C.cc 3 Dec 2005 10:30:41 -0000 1.4 -@@ -231,8 +231,11 @@ - (*outputFunc)(outputStream, - "0 1 255 {1 index exch /.notdef put} for\n", 40); - enc = newEncoding ? newEncoding : encoding; -+ if(!enc) { -+ fprintf(stderr, "convertToType1: Warning: No Encoding\n"); -+ } - for (i = 0; i < 256; ++i) { -- if (enc[i]) { -+ if (enc && enc[i]) { - sprintf(buf, "dup %d /%s put\n", i, enc[i]); - (*outputFunc)(outputStream, buf, strlen(buf)); - } Index: Gfx.cc =================================================================== RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/Gfx.cc,v @@ -27,18 +6,20 @@ 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); for (i = 0; i < 6; ++i) { -@@ -450,7 +450,9 @@ +@@ -450,7 +450,8 @@ abortCheckCbkData = abortCheckCbkDataA; // set crop box @@ -48,13 +29,13 @@ diff -u -r1.9 -r1.10 state->moveTo(cropBox->x1, cropBox->y1); state->lineTo(cropBox->x2, cropBox->y1); state->lineTo(cropBox->x2, cropBox->y2); -@@ -459,7 +459,7 @@ +@@ -459,7 +460,8 @@ state->clip(); out->clip(state); state->clearPath(); - } + } -+#endif XPDFEXE ++#endif } Gfx::Gfx(XRef *xrefA, OutputDev *outA, Dict *resDict, @@ -153,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 @@ -191,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); @@ -224,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); @@ -318,28 +325,6 @@ diff -u -r1.4 -r1.7 break; } -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 -@@ -357,6 +357,10 @@ - GBool loadPlugin(char *type, char *name); - #endif - -+ //----- config file base path -+ -+ GString*path; -+ - //----- static tables - - NameToCharCode * // mapping from char name to -j@@ -318,1 +318,1 @@ -- void parseFile(GString *fileName, FILE *f); -+public: void parseFile(GString *fileName, FILE *f); private: Index: Lexer.cc =================================================================== RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/Lexer.cc,v @@ -466,34 +451,6 @@ diff -u -r1.7 -r1.9 // End a page. virtual void endPage() {} -Index: Page.cc -=================================================================== -RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/Page.cc,v -retrieving revision 1.5 -retrieving revision 1.6 -diff -u -r1.5 -r1.6 ---- Page.cc 3 Dec 2005 10:11:33 -0000 1.5 -+++ Page.cc 3 Dec 2005 10:30:41 -0000 1.6 -@@ -66,6 +66,19 @@ - cropBox = mediaBox; - } - -+ /* if the crop box is larger than the media box, cut it down to -+ media box size */ -+ if(haveCropBox && -+ mediaBox.x1 <= cropBox.x2 && -+ mediaBox.y1 <= cropBox.y2 && -+ cropBox.x1 <= mediaBox.x2 && -+ cropBox.y1 <= mediaBox.y2) { -+ if(mediaBox.x1 >= cropBox.x1) cropBox.x1 = mediaBox.x1; -+ if(mediaBox.y1 >= cropBox.y1) cropBox.y1 = mediaBox.y1; -+ if(mediaBox.x2 <= cropBox.x2) cropBox.x2 = mediaBox.x2; -+ if(mediaBox.y2 <= cropBox.y2) cropBox.y2 = mediaBox.y2; -+ } -+ - // other boxes - bleedBox = cropBox; - readBox(dict, "BleedBox", &bleedBox); Index: Stream.cc =================================================================== RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/Stream.cc,v @@ -512,17 +469,12 @@ diff -u -r1.7 -r1.8 #include #include Index: config.h -=================================================================== -RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/config.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 @@ +--- config.h 2007-09-09 12:11:20.000000000 +0200 ++++ config.h 2007-09-09 12:11:40.000000000 +0200 +@@ -53,9 +53,9 @@ // user config file name, relative to the user's home directory - #if defined(VMS) || (defined(WIN32) && !defined(__CYGWIN32__)) + #if defined(VMS) || defined(WIN32) -#define xpdfUserConfigFile "xpdfrc" +#define xpdfUserConfigFile "pdf2swf.conf" #else @@ -531,10 +483,7 @@ diff -u -r1.5 -r1.6 #endif // system config file name (set via the configure script) --#ifdef SYSTEM_XPDFRC --#define xpdfSysConfigFile SYSTEM_XPDFRC -+#ifndef WIN32 -+#define xpdfSysConfigFile "/etc/pdf2swf.conf" +@@ -64,7 +64,7 @@ #else // under Windows, we get the directory with the executable and then // append this file name @@ -649,18 +598,40 @@ diff -u -r1.9 -r1.10 // 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); ---- pdf/xpdf-3.01.16/GlobalParams.h 2006-11-12 11:20:54.000000000 +0100 -+++ j 2006-11-12 11:19:40.000000000 +0100 -@@ -315,7 +315,7 @@ - private: - - void createDefaultKeyBindings(); +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 +@@ -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: - void parseNameToUnicode(GList *tokens, GString *fileName, int line); - void parseCIDToUnicode(GList *tokens, GString *fileName, int line); - void parseUnicodeToUnicode(GList *tokens, GString *fileName, int line); ---- SplashOutputDev.h.orig 2006-11-12 12:07:22.000000000 +0100 +@@ -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 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 @@ -671,7 +642,7 @@ diff -u -r1.9 -r1.10 // 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; @@ -682,7 +653,7 @@ diff -u -r1.9 -r1.10 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 @@ -693,7 +664,7 @@ diff -u -r1.9 -r1.10 // 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 @@ } @@ -704,7 +675,7 @@ diff -u -r1.9 -r1.10 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 @@ @@ -713,3 +684,185 @@ diff -u -r1.9 -r1.10 - 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" +--- SplashFont.h 2007-09-09 14:23:47.000000000 +0200 ++++ SplashFont.h 2007-09-09 14:24:28.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; + +--- SplashFTFont.h 2007-09-09 14:23:47.000000000 +0200 ++++ SplashFTFont.h 2007-09-09 14:25:19.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); + +--- SplashFTFont.cc.h 2007-09-09 14:23:50.000000000 +0200 ++++ SplashFTFont.cc 2007-09-09 14:27:35.000000000 +0200 +@@ -228,6 +228,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 +--- 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);