xpdf-3.02 fixes

[swftools.git] / lib / pdf / xpdf-changes.patch

diff --git a/lib/pdf/xpdf-changes.patch b/lib/pdf/xpdf-changes.patch
index 37f9107..b2b7a92 100644 (file)
--- 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,
@@ -702,3 +681,15 @@ 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"