X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fpdf%2Fxpdf-changes.patch;h=c6c2db060763e8007c653394c86b1d8e91a805dd;hb=70bab22302a67dc820ef021691d1766a30a1aed8;hp=8ecde89a7eb0ffa34614edd337b3e9419c06a5c2;hpb=9162c553a0305fc19122e911bd0c2599ac9a55ef;p=swftools.git

diff --git a/lib/pdf/xpdf-changes.patch b/lib/pdf/xpdf-changes.patch
index 8ecde89..c6c2db0 100644
--- a/lib/pdf/xpdf-changes.patch
+++ b/lib/pdf/xpdf-changes.patch
@@ -39,6 +39,24 @@ 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
@@ -134,6 +152,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