X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Fpdf%2Fxpdf-changes.patch;h=c35db9d1ffc3708a7213f6427aaffc8f0080e03b;hp=234952dbf4a2b6a0d30a92e5bfaea5156582d323;hb=b4374fdcbc8b908a6a0aa370c564326ed0653f08;hpb=ad60d7e0a361c58fc9872753cfb872c3cc54b82f

diff --git a/lib/pdf/xpdf-changes.patch b/lib/pdf/xpdf-changes.patch
index 234952d..c35db9d 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 <string.h>
  #include <ctype.h>
-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 <math.h>
  #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 (tx<softMask->getWidth() && ty<softMask->getHeight())
+   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());
@@ -1010,3 +985,82 @@ diff -u -r1.5 -r1.6
      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);
+       }
+     }