fixed jbig memory alloc problem

[swftools.git] / lib / pdf / xpdf-changes.patch

diff --git a/lib/pdf/xpdf-changes.patch b/lib/pdf/xpdf-changes.patch
index e3d8481..560d709 100644 (file)
--- a/lib/pdf/xpdf-changes.patch
+++ b/lib/pdf/xpdf-changes.patch
@@ -541,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 @@
@@ -881,7 +870,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());
@@ -986,3 +975,54 @@ 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 *));