X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fpdf%2Fxpdf-changes.patch;h=c45213a9ea1473015340e2e381780124119c2221;hb=d047ab5d9aee6224e864c10bce623e43c56a13c3;hp=020ce3ddc648fd5db1fabdfd95c5442179eb0bb4;hpb=f3bc04e70501213ea1d9d2aa22d5c2fa550dab3f;p=swftools.git

diff --git a/lib/pdf/xpdf-changes.patch b/lib/pdf/xpdf-changes.patch
index 020ce3d..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);
@@ -441,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
@@ -460,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
@@ -665,14 +659,3 @@ diff -u -r1.5 -r1.6
  #include "gmem.h"
  #include "GString.h"
  #include "gfile.h"
---- xpdf/pdftoppm.cc.orig	2007-03-07 18:00:34.000000000 +0100
-+++ xpdf/pdftoppm.cc	2007-03-07 18:00:41.000000000 +0100
-@@ -179,7 +179,7 @@
-   splashOut->startDoc(doc->getXRef());
-   for (pg = firstPage; pg <= lastPage; ++pg) {
-     doc->displayPage(splashOut, pg, resolution, resolution, 0,
--		     gFalse, gTrue, gFalse);
-+		     /*usemediabox*/gTrue, gTrue, gFalse);
-     sprintf(ppmFile, "%.*s-%06d.%s",
- 	    (int)sizeof(ppmFile) - 32, ppmRoot, pg,
- 	    mono ? "pbm" : gray ? "pgm" : "ppm");