X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fpdf%2Fxpdf-changes.patch;h=c45213a9ea1473015340e2e381780124119c2221;hb=e6e0543b4decec78f04f321f3b1bf6ada63413e3;hp=b2b7a925b7791bcaed87270198528f0fda4246b2;hpb=8a8b565fc2afe928ac84943079b3500ff5667ba9;p=swftools.git

diff --git a/lib/pdf/xpdf-changes.patch b/lib/pdf/xpdf-changes.patch
index b2b7a92..c45213a 100644
--- a/lib/pdf/xpdf-changes.patch
+++ b/lib/pdf/xpdf-changes.patch
@@ -6,13 +6,15 @@ retrieving revision 1.10
 diff -u -r1.9 -r1.10
 --- Gfx.cc	3 Dec 2005 10:11:33 -0000	1.9
 +++ Gfx.cc	3 Dec 2005 10:30:41 -0000	1.10
-@@ -439,7 +439,9 @@
+@@ -439,7 +439,11 @@
    fontChanged = gFalse;
    clip = clipNone;
    ignoreUndef = 0;
 -  out->startPage(pageNum, state);
 +  if(cropBox) {
 +      out->startPage(pageNum, state, cropBox->x1,cropBox->y1,cropBox->x2,cropBox->y2);
++  } else {
++      out->startPage(pageNum, state, 0,0,0,0);
 +  }
    out->setDefaultCTM(state->getCTM());
    out->updateAll(state);
@@ -423,34 +425,6 @@ diff -u -r1.7 -r1.9
  
    // End a page.
    virtual void endPage() {}
-Index: Page.cc
-===================================================================
-RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/Page.cc,v
-retrieving revision 1.5
-retrieving revision 1.6
-diff -u -r1.5 -r1.6
---- Page.cc	3 Dec 2005 10:11:33 -0000	1.5
-+++ Page.cc	3 Dec 2005 10:30:41 -0000	1.6
-@@ -66,6 +66,19 @@
-     cropBox = mediaBox;
-   }
- 
-+  /* if the crop box is larger than the media box, cut it down to 
-+     media box size */
-+  if(haveCropBox &&
-+     mediaBox.x1 <= cropBox.x2 &&
-+     mediaBox.y1 <= cropBox.y2 &&
-+     cropBox.x1 <= mediaBox.x2 &&
-+     cropBox.y1 <= mediaBox.y2) {
-+      if(mediaBox.x1 >= cropBox.x1) cropBox.x1 = mediaBox.x1;
-+      if(mediaBox.y1 >= cropBox.y1) cropBox.y1 = mediaBox.y1;
-+      if(mediaBox.x2 <= cropBox.x2) cropBox.x2 = mediaBox.x2;
-+      if(mediaBox.y2 <= cropBox.y2) cropBox.y2 = mediaBox.y2;
-+  }
-+
-   // other boxes
-   bleedBox = cropBox;
-   readBox(dict, "BleedBox", &bleedBox);
 Index: Stream.cc
 ===================================================================
 RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/Stream.cc,v
@@ -469,17 +443,12 @@ diff -u -r1.7 -r1.8
  #include <string.h>
  #include <ctype.h>
 Index: config.h
-===================================================================
-RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/config.h,v
-retrieving revision 1.5
-retrieving revision 1.6
-diff -u -r1.5 -r1.6
---- config.h	3 Dec 2005 10:11:33 -0000	1.5
-+++ config.h	3 Dec 2005 10:30:41 -0000	1.6
-@@ -53,18 +53,18 @@
+--- config.h.orig	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__))
+ #if defined(VMS) || defined(WIN32)
 -#define xpdfUserConfigFile "xpdfrc"
 +#define xpdfUserConfigFile "pdf2swf.conf"
  #else
@@ -488,10 +457,7 @@ diff -u -r1.5 -r1.6
  #endif
  
  // system config file name (set via the configure script)
--#ifdef SYSTEM_XPDFRC
--#define xpdfSysConfigFile SYSTEM_XPDFRC
-+#ifndef WIN32
-+#define xpdfSysConfigFile "/etc/pdf2swf.conf"
+@@ -64,7 +64,7 @@
  #else
  // under Windows, we get the directory with the executable and then
  // append this file name