X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=lib%2Fpdf%2Fxpdf-changes.patch;h=020ce3ddc648fd5db1fabdfd95c5442179eb0bb4;hb=f3bc04e70501213ea1d9d2aa22d5c2fa550dab3f;hp=37f9107087fe1353a79bf9c36a7df77e9815d7ad;hpb=fef95e60206cee5ac6d05927fc8afb1cd32f89d7;p=swftools.git

diff --git a/lib/pdf/xpdf-changes.patch b/lib/pdf/xpdf-changes.patch
index 37f9107..020ce3d 100644
--- a/lib/pdf/xpdf-changes.patch
+++ b/lib/pdf/xpdf-changes.patch
@@ -1,24 +1,3 @@
-Index: FoFiType1C.cc
-===================================================================
-RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/FoFiType1C.cc,v
-retrieving revision 1.3
-retrieving revision 1.4
-diff -u -r1.3 -r1.4
---- FoFiType1C.cc	3 Dec 2005 10:11:33 -0000	1.3
-+++ FoFiType1C.cc	3 Dec 2005 10:30:41 -0000	1.4
-@@ -231,8 +231,11 @@
-     (*outputFunc)(outputStream,
- 		  "0 1 255 {1 index exch /.notdef put} for\n", 40);
-     enc = newEncoding ? newEncoding : encoding;
-+    if(!enc) {
-+	fprintf(stderr, "convertToType1: Warning: No Encoding\n");
-+    }
-     for (i = 0; i < 256; ++i) {
--      if (enc[i]) {
-+      if (enc && enc[i]) {
- 	sprintf(buf, "dup %d /%s put\n", i, enc[i]);
- 	(*outputFunc)(outputStream, buf, strlen(buf));
-       }
 Index: Gfx.cc
 ===================================================================
 RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/Gfx.cc,v
@@ -54,7 +33,7 @@ diff -u -r1.9 -r1.10
      state->clearPath();
 -  }
 +  }
-+#endif XPDFEXE
++#endif
  }
  
  Gfx::Gfx(XRef *xrefA, OutputDev *outA, Dict *resDict,
@@ -444,34 +423,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
@@ -702,3 +653,26 @@ diff -u -r1.5 -r1.6
 -  startPage(0, NULL);
 +  startPage(0, NULL, 0,0,0,0);
  }
+--- SplashFTFontEngine.cc	2006-11-19 22:30:44.000000000 +0100
++++ SplashFTFontEngine.cc	2006-11-19 22:30:56.000000000 +0100
+@@ -13,9 +13,7 @@
+ #endif
+ 
+ #include <stdio.h>
+-#ifndef WIN32
+ #  include <unistd.h>
+-#endif
+ #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");