X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Fpdf%2Fxpdf-changes.patch;h=42ff39f0cdbb984852a9a3d18ae4e8e72f5e6527;hp=83adec36612a025fba5f53d7d0f4dc8dd5f62a5a;hb=7dff01be4c5c03eb4908285a751a8b5e03054c48;hpb=5bb4220dab94b32a7243d3752ebf473061d34204 diff --git a/lib/pdf/xpdf-changes.patch b/lib/pdf/xpdf-changes.patch index 83adec3..42ff39f 100644 --- a/lib/pdf/xpdf-changes.patch +++ b/lib/pdf/xpdf-changes.patch @@ -468,30 +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) && !defined(__CYGWIN32__)) --#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.h =================================================================== RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/gfile.h,v @@ -554,28 +530,6 @@ diff -u -r1.5 -r1.6 // 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.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 @@ @@ -618,6 +572,27 @@ diff -u -r1.5 -r1.6 #include #include "gfile.h" #include "GlobalParams.h" +@@ -702,7 +703,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]; +@@ -2646,9 +2647,9 @@ + + softMask = new SplashBitmap(bitmap->getWidth(), bitmap->getHeight(), + 1, splashModeMono8, gFalse); +- memset(softMask->getDataPtr(), 0, +- softMask->getRowSize() * softMask->getHeight()); ++ memset(softMask->getDataPtr(), 0x00, softMask->getRowSize()*softMask->getHeight()); + p = softMask->getDataPtr() + ty * softMask->getRowSize() + tx; ++ if (txgetWidth() && tygetHeight()) + for (y = 0; y < tBitmap->getHeight(); ++y) { + for (x = 0; x < tBitmap->getWidth(); ++x) { + tBitmap->getPixel(x, y, color); --- SplashFontFile.cc 2007-09-09 12:33:00.000000000 +0200 +++ SplashFontFile.cc 2007-09-09 12:33:07.000000000 +0200 @@ -11,9 +11,7 @@ @@ -905,7 +880,7 @@ diff -u -r1.5 -r1.6 + // 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()); @@ -992,3 +967,202 @@ diff -u -r1.5 -r1.6 } 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 *)); +--- xpdf/SplashXPathScanner.cc.orig 2010-01-21 16:00:38.000000000 -0800 ++++ xpdf/SplashXPathScanner.cc 2010-01-21 16:10:31.000000000 -0800 +@@ -394,10 +394,10 @@ + *p++ &= mask; + xx = (xx & ~7) + 8; + } +- for (; xx + 7 <= xx0; xx += 8) { ++ for (; xx + 7 < xx0; xx += 8) { + *p++ = 0x00; + } +- if (xx <= xx0) { ++ if (xx < xx0) { + *p &= 0xff >> (xx0 & 7); + } + } +@@ -417,10 +417,10 @@ + *p++ &= mask; + xx = (xx & ~7) + 8; + } +- for (; xx + 7 <= xx0; xx += 8) { ++ for (; xx + 7 < xx0; xx += 8) { + *p++ = 0x00; + } +- if (xx <= xx0) { ++ if (xx < xx0) { + *p &= 0xff >> (xx0 & 7); + } + } +--- xpdf/CharCodeToUnicode.cc.orig 2010-01-25 12:43:00.000000000 -0800 ++++ xpdf/CharCodeToUnicode.cc 2010-01-28 14:14:53.000000000 -0800 +@@ -208,13 +208,13 @@ + int nBits) { + PSTokenizer *pst; + char tok1[256], tok2[256], tok3[256]; +- int nDigits, n1, n2, n3; ++ int maxCode, n1, n2, n3; + CharCode i; + CharCode code1, code2; + GString *name; + FILE *f; + +- nDigits = nBits / 4; ++ maxCode = (nBits == 8) ? 0xff : (nBits == 16) ? 0xffff : 0xffffffff; + pst = new PSTokenizer(getCharFunc, data); + pst->getToken(tok1, sizeof(tok1), &n1); + while (pst->getToken(tok2, sizeof(tok2), &n2)) { +@@ -241,9 +241,9 @@ + error(-1, "Illegal entry in bfchar block in ToUnicode CMap"); + break; + } +- if (!(n1 == 2 + nDigits && tok1[0] == '<' && tok1[n1 - 1] == '>' && ++ if (!(tok1[0] == '<' && tok1[n1 - 1] == '>' && + tok2[0] == '<' && tok2[n2 - 1] == '>')) { +- error(-1, "Illegal entry in bfchar block in ToUnicode CMap"); ++ error(-1, "Illegal entry in bfchar block in ToUnicode CMap."); + continue; + } + tok1[n1 - 1] = tok2[n2 - 1] = '\0'; +@@ -251,6 +251,9 @@ + error(-1, "Illegal entry in bfchar block in ToUnicode CMap"); + continue; + } ++ if (code1 > maxCode) { ++ error(-1, "Invalid entry in bfchar block in ToUnicode CMap"); ++ } + addMapping(code1, tok2 + 1, n2 - 2, 0); + } + pst->getToken(tok1, sizeof(tok1), &n1); +@@ -266,8 +269,8 @@ + error(-1, "Illegal entry in bfrange block in ToUnicode CMap"); + break; + } +- if (!(n1 == 2 + nDigits && tok1[0] == '<' && tok1[n1 - 1] == '>' && +- n2 == 2 + nDigits && tok2[0] == '<' && tok2[n2 - 1] == '>')) { ++ if (!(tok1[0] == '<' && tok1[n1 - 1] == '>' && ++ tok2[0] == '<' && tok2[n2 - 1] == '>')) { + error(-1, "Illegal entry in bfrange block in ToUnicode CMap"); + continue; + } +@@ -277,6 +280,10 @@ + error(-1, "Illegal entry in bfrange block in ToUnicode CMap"); + continue; + } ++ if (code1 > maxCode || code2 > maxCode) { ++ error(-1, "Invalid entry in bfrange block in ToUnicode CMap"); ++ } ++ + if (!strcmp(tok3, "[")) { + i = 0; + while (pst->getToken(tok1, sizeof(tok1), &n1) && +--- xpdf/Decrypt.cc.orig 2010-01-28 14:19:51.000000000 -0800 ++++ xpdf/Decrypt.cc 2010-02-02 16:04:53.000000000 -0800 +@@ -596,6 +596,7 @@ + s->bufIdx = 0; + if (last) { + n = s->buf[15]; ++ if(!n || n>16) n=16; + for (i = 15; i >= n; --i) { + s->buf[i] = s->buf[i-n]; + } +--- xpdf/Catalog.cc.orig 2010-02-02 16:17:24.000000000 -0800 ++++ xpdf/Catalog.cc 2010-02-02 16:18:48.000000000 -0800 +@@ -193,7 +193,7 @@ + if (!kids.isArray()) { + error(-1, "Kids object (page %d) is wrong type (%s)", + start+1, kids.getTypeName()); +- goto err1; ++ return start; + } + for (i = 0; i < kids.arrayGetLength(); ++i) { + kids.arrayGetNF(i, &kidRef); +--- xpdf/SplashOutputDev.cc.orig 2010-03-25 14:06:37.000000000 -0700 ++++ xpdf/SplashOutputDev.cc 2010-03-25 14:07:23.000000000 -0700 +@@ -13,6 +13,7 @@ +@@ -509,7 +510,14 @@ + glyphY = glyphYA; + glyphW = glyphWA; + glyphH = glyphHA; +- validBBox = validBBoxA; ++ ++ if(glyphW<=0 || glyphH<=0 || (double)glyphH*(double)glyphW>536870912) { ++ glyphW = glyphH = 128; ++ validBBox = gFalse; ++ } else { ++ validBBox = validBBoxA; ++ } ++ + if (aa) { + glyphSize = glyphW * glyphH; + } else {