X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Fpdf%2Fxpdf-changes.patch;h=560d709f9a66c9140595fd3f01a572570460abbc;hp=f7ff2fdf27b7c1ebf28dfaba9c8add22ef5af2ed;hb=4de6f0dccaa56db82195ff4b2a8111324a9dd107;hpb=6f752003d958028263b5c07c422eaad0e7ec4390 diff --git a/lib/pdf/xpdf-changes.patch b/lib/pdf/xpdf-changes.patch index f7ff2fd..560d709 100644 --- a/lib/pdf/xpdf-changes.patch +++ b/lib/pdf/xpdf-changes.patch @@ -39,24 +39,6 @@ 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 @@ -486,118 +468,6 @@ diff -u -r1.7 -r1.8 #endif #include #include -Index: config.h ---- 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) --#define xpdfUserConfigFile "xpdfrc" -+#define xpdfUserConfigFile "pdf2swf.conf" - #else --#define xpdfUserConfigFile ".xpdfrc" -+#define xpdfUserConfigFile ".pdf2swf.conf" - #endif - - // system config file name (set via the configure script) -@@ -64,7 +64,7 @@ - #else - // under Windows, we get the directory with the executable and then - // append this file name --#define xpdfSysConfigFile "xpdfrc" -+#define xpdfSysConfigFile "pdf2swf.conf" - #endif - - //------------------------------------------------------------------------ -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 @@ - #endif - } - -+static char* getTempDir() -+{ -+#ifdef WIN32 -+ char*dir = getenv("TMP"); -+ if(!dir) dir = getenv("TEMP"); -+ if(!dir) dir = getenv("tmp"); -+ if(!dir) dir = getenv("temp"); -+ if(!dir) dir = "C:\\"; -+#else -+ char* dir = "/tmp/"; -+#endif -+ return dir; -+} -+ -+char* mktmpname(char*ptr) { -+ static char tmpbuf[128]; -+ char*dir = getTempDir(); -+ int l = strlen(dir); -+ char*sep = ""; -+ if(!ptr) -+ ptr = tmpbuf; -+ if(l && dir[l-1]!='/' && dir[l-1]!='\\') { -+#ifdef WIN32 -+ sep = "\\"; -+#else -+ sep = "/"; -+#endif -+ } -+ -+ // 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()); -+#else -+# ifdef HAVE_RAND -+ sprintf(ptr, "%s%s%08x%08x",dir,sep,rand(),rand()); -+# else -+ static int count = 1; -+ sprintf(ptr, "%s%s%08x%04x%04x",dir,sep,time(0),(unsigned int)tmpbuf^((unsigned int)tmpbuf)>>16,count); -+ count ++; -+# endif -+#endif -+ return ptr; -+} -+ -+ - GBool openTempFile(GString **name, FILE **f, char *mode, char *ext) { - #if defined(WIN32) - //---------- Win32 ---------- -@@ -463,7 +509,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. -- if (!(s = tmpnam(NULL))) { -+ if (!(s = mktmpname(NULL))) { - return gFalse; - } - *name = new GString(s); -@@ -490,7 +536,7 @@ - (*name)->append("/XXXXXX")->append(ext); - fd = mkstemps((*name)->getCString(), strlen(ext)); - #else -- if (!(s = tmpnam(NULL))) { -+ if (!(s = mktmpname(NULL))) { - return gFalse; - } - *name = new GString(s); -@@ -507,7 +553,7 @@ - (*name)->append("/XXXXXX"); - fd = mkstemp((*name)->getCString()); - #else // HAVE_MKSTEMP -- if (!(s = tmpnam(NULL))) { -+ if (!(s = mktmpname(NULL))) { - return gFalse; - } - *name = new GString(s); Index: gfile.h =================================================================== RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/gfile.h,v @@ -671,17 +541,6 @@ diff -u -r1.5 -r1.6 int w, h; double *ctm; SplashCoord mat[6]; ---- 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 - - // 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(); --- TextOutputDev.cc 2006-11-12 12:22:53.000000000 +0100 +++ TextOutputDev.cc 2006-11-12 12:25:03.000000000 +0100 @@ -3805,7 +3805,7 @@ @@ -880,8 +739,8 @@ diff -u -r1.5 -r1.6 } 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 +--- 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; @@ -923,7 +782,16 @@ diff -u -r1.5 -r1.6 ff = (SplashFTFontFile *)fontFile; ff->face->size = sizeObj; FT_Set_Transform(ff->face, &textMatrix, NULL); -@@ -268,6 +281,8 @@ +@@ -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; } @@ -932,6 +800,15 @@ diff -u -r1.5 -r1.6 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 @@ @@ -944,3 +821,208 @@ diff -u -r1.5 -r1.6 // 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 + } + ++static char* getTempDir() ++{ ++#ifdef WIN32 ++ char*dir = getenv("TMP"); ++ if(!dir) dir = getenv("TEMP"); ++ if(!dir) dir = getenv("tmp"); ++ if(!dir) dir = getenv("temp"); ++ if(!dir) dir = "C:\\"; ++#else ++ char* dir = "/tmp/"; ++#endif ++ return dir; ++} ++ ++char* mktmpname(char*ptr) { ++ static char tmpbuf[128]; ++ char*dir = getTempDir(); ++ int l = strlen(dir); ++ char*sep = ""; ++ if(!ptr) ++ ptr = tmpbuf; ++ if(l && dir[l-1]!='/' && dir[l-1]!='\\') { ++#ifdef WIN32 ++ sep = "\\"; ++#else ++ sep = "/"; ++#endif ++ } ++ ++ // 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,(unsigned int)lrand48(),(unsigned int)lrand48()); ++#else ++# ifdef HAVE_RAND ++ sprintf(ptr, "%s%s%08x%08x",dir,sep,rand(),rand()); ++# else ++ static int count = 1; ++ sprintf(ptr, "%s%s%08x%04x%04x",dir,sep,time(0),(unsigned int)tmpbuf^((unsigned int)tmpbuf)>>16,count); ++ count ++; ++# endif ++#endif ++ return ptr; ++} ++ ++ + GBool openTempFile(GString **name, FILE **f, char *mode, char *ext) { + #if defined(WIN32) + //---------- Win32 ---------- +@@ -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. +- if (!(s = tmpnam(NULL))) { ++ if (!(s = mktmpname(NULL))) { + return gFalse; + } + *name = new GString(s); +@@ -516,7 +562,7 @@ + (*name)->append("/XXXXXX")->append(ext); + fd = mkstemps((*name)->getCString(), strlen(ext)); + #else +- if (!(s = tmpnam(NULL))) { ++ if (!(s = mktmpname(NULL))) { + return gFalse; + } + *name = new GString(s); +@@ -533,7 +579,7 @@ + (*name)->append("/XXXXXX"); + fd = mkstemp((*name)->getCString()); + #else // HAVE_MKSTEMP +- if (!(s = tmpnam(NULL))) { ++ if (!(s = mktmpname(NULL))) { + return gFalse; + } + *name = new GString(s); +--- 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; + + // 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); + } + +--- 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; + }; + + //------------------------------------------------------------------------ +@@ -578,7 +579,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(); +--- xpdf/JBIG2Stream.cc.orig 2010-01-08 17:17:18.000000000 -0800 ++++ xpdf/JBIG2Stream.cc 2010-01-21 15:28:26.000000000 -0800 +@@ -1514,11 +1514,14 @@ + } + + // compute symbol code length +- symCodeLen = 1; +- i = (numInputSyms + numNewSyms) >> 1; +- while (i) { +- ++symCodeLen; +- i >>= 1; ++ symCodeLen = 0; ++ i = 1; ++ while (i < numInputSyms + numNewSyms) { ++ ++symCodeLen; ++ i <<= 1; ++ } ++ if (huff && symCodeLen == 0) { ++ symCodeLen = 1; + } + + // get the input symbol bitmaps +@@ -1921,6 +1924,9 @@ + ++symCodeLen; + i <<= 1; + } ++ if (huff && symCodeLen == 0) { ++ symCodeLen = 1; ++ } + + // get the symbol bitmaps + syms = (JBIG2Bitmap **)gmallocn(numSyms, sizeof(JBIG2Bitmap *));