X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fpdf%2Fxpdf-changes.patch;h=ff6180661c2d15c5e79ab95e480930463a3445b7;hb=8d43594b2a28585e904dbd8414ae3ce278ee3833;hp=5ea3a8656264023281ea9077c83fe15fcd78a3c5;hpb=3fea2408c808249a16b4b9113e4721fcdedaf1ab;p=swftools.git

diff --git a/lib/pdf/xpdf-changes.patch b/lib/pdf/xpdf-changes.patch
index 5ea3a86..ff61806 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
@@ -492,7 +474,7 @@ Index: config.h
 @@ -53,9 +53,9 @@
  
  // user config file name, relative to the user's home directory
- #if defined(VMS) || defined(WIN32)
+ #if defined(VMS) || (defined(WIN32) && !defined(__CYGWIN32__))
 -#define xpdfUserConfigFile "xpdfrc"
 +#define xpdfUserConfigFile "pdf2swf.conf"
  #else
@@ -862,7 +844,7 @@ diff -u -r1.5 -r1.6
  int SplashScreen::test(int x, int y, Guchar value) {
    int xx, yy;
  
-+  return 0;
++  return 1;
 +
    if (value < minVal) {
      return 0;