reorganize pdfTeX patches for libs/xpdf/

git-svn-id: svn://tug.org/texlive/trunk@12933 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 126 insertions, 98 deletions

diff --git a/Build/source/libs/xpdf/ChangeLog b/Build/source/libs/xpdf/ChangeLog
index 014120ee846..5321108b993 100644
--- a/Build/source/libs/xpdf/ChangeLog
+++ b/Build/source/libs/xpdf/ChangeLog
@@ -1,3 +1,11 @@
+2009-05-05  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* xpdf-3.02-PATCHES/patch-15-fix-pow-arg,
+	xpdf-3.02-PATCHES/patch-16-size-of-struct,
+	xpdf-3.02-PATCHES/patch-17-strCrypt (new):
+	three small patches split off from ...
+	* xpdf-3.02-PATCHES/patch-20-pdftex: ... this file.
+
 2009-04-30  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Applied official 3.02pl3 patch
diff --git a/Build/source/libs/xpdf/xpdf-3.02-PATCHES/patch-15-fix-pow-arg b/Build/source/libs/xpdf/xpdf-3.02-PATCHES/patch-15-fix-pow-arg
new file mode 100644
index 00000000000..0f49b819d2a
--- /dev/null
+++ b/Build/source/libs/xpdf/xpdf-3.02-PATCHES/patch-15-fix-pow-arg
@@ -0,0 +1,28 @@
+	It seems some compilers don't like a call of pow(int, int).
+
+	from:
+		Han The Thanh <thanh@pdftex.org>
+		Martin Schroeder <martin@pdftex.org>
+
+diff -ur -N xpdf-3.02.orig/goo/GString.cc xpdf-3.02/goo/GString.cc
+--- xpdf-3.02.orig/goo/GString.cc	2007-02-27 23:05:51.000000000 +0100
++++ xpdf-3.02/goo/GString.cc	2008-05-08 15:40:41.000000000 +0200
+@@ -7,6 +7,9 @@
+ // Copyright 1996-2003 Glyph & Cog, LLC
+ //
+ //========================================================================
++//  Modified for TeX Live by Peter Breitenlohner <tex-live@tug.org>
++//  See top-level ChangeLog for a list of all modifications
++//========================================================================
+ 
+ #include <aconf.h>
+ 
+@@ -528,7 +531,7 @@
+   if ((neg = x < 0)) {
+     x = -x;
+   }
+-  x = floor(x * pow(10, prec) + 0.5);
++  x = floor(x * pow(10.0, prec) + 0.5);
+   i = bufSize;
+   started = !trim;
+   for (j = 0; j < prec && i > 1; ++j) {
diff --git a/Build/source/libs/xpdf/xpdf-3.02-PATCHES/patch-16-size-of-struct b/Build/source/libs/xpdf/xpdf-3.02-PATCHES/patch-16-size-of-struct
new file mode 100644
index 00000000000..8dee7f1f297
--- /dev/null
+++ b/Build/source/libs/xpdf/xpdf-3.02-PATCHES/patch-16-size-of-struct
@@ -0,0 +1,40 @@
+	Not needed, DISABLE_OUTLINE is no longer used in pdftex sources,
+	but might be nevertheless useful.
+
+	from:
+		Han The Thanh <thanh@pdftex.org>
+		Martin Schroeder <martin@pdftex.org>
+
+diff -ur -N xpdf-3.02.orig/xpdf/PDFDoc.h xpdf-3.02/xpdf/PDFDoc.h
+--- xpdf-3.02.orig/xpdf/PDFDoc.h	2007-02-27 23:05:52.000000000 +0100
++++ xpdf-3.02/xpdf/PDFDoc.h	2008-07-17 02:29:04.000000000 +0200
+@@ -5,6 +5,9 @@
+ // Copyright 1996-2003 Glyph & Cog, LLC
+ //
+ //========================================================================
++//  Modified for TeX Live by Peter Breitenlohner <tex-live@tug.org>
++//  See top-level ChangeLog for a list of all modifications
++//========================================================================
+ 
+ #ifndef PDFDOC_H
+ #define PDFDOC_H
+@@ -171,13 +174,15 @@
+   double pdfVersion;
+   XRef *xref;
+   Catalog *catalog;
++  GBool ok;
++  int errCode;
++/* Keep the size of the structure the same whether DISABLE_OUTLINE or
++   not, and put it last to try to find errors more quickly.  */
+ #ifndef DISABLE_OUTLINE
+   Outline *outline;
++#else
++  void *dummy;
+ #endif
+-
+-
+-  GBool ok;
+-  int errCode;
+ };
+ 
+ #endif
diff --git a/Build/source/libs/xpdf/xpdf-3.02-PATCHES/patch-17-strCrypt b/Build/source/libs/xpdf/xpdf-3.02-PATCHES/patch-17-strCrypt
new file mode 100644
index 00000000000..d6bd42725b7
--- /dev/null
+++ b/Build/source/libs/xpdf/xpdf-3.02-PATCHES/patch-17-strCrypt
@@ -0,0 +1,50 @@
+	I don't know why this is needed. The pdfTeX svn log says
+	"Import libpng 1.2.24 into stable". ???
+
+	from:
+		Han The Thanh <thanh@pdftex.org>
+		Martin Schroeder <martin@pdftex.org>
+
+diff -ur -N xpdf-3.02.orig/xpdf/Decrypt.h xpdf-3.02/xpdf/Decrypt.h
+--- xpdf-3.02.orig/xpdf/Decrypt.h	2007-02-27 23:05:52.000000000 +0100
++++ xpdf-3.02/xpdf/Decrypt.h	2008-05-08 15:40:41.000000000 +0200
+@@ -5,6 +5,9 @@
+ // Copyright 1996-2003 Glyph & Cog, LLC
+ //
+ //========================================================================
++//  Modified for TeX Live by Peter Breitenlohner <tex-live@tug.org>
++//  See top-level ChangeLog for a list of all modifications
++//========================================================================
+ 
+ #ifndef DECRYPT_H
+ #define DECRYPT_H
+@@ -73,7 +76,7 @@
+ 		CryptAlgorithm algoA, int keyLength,
+ 		int objNum, int objGen);
+   virtual ~DecryptStream();
+-  virtual StreamKind getKind() { return strWeird; }
++  virtual StreamKind getKind() { return strCrypt; }
+   virtual void reset();
+   virtual int getChar();
+   virtual int lookChar();
+diff -ur -N xpdf-3.02.orig/xpdf/Stream.h xpdf-3.02/xpdf/Stream.h
+--- xpdf-3.02.orig/xpdf/Stream.h	2007-11-12 13:27:21.000000000 +0100
++++ xpdf-3.02/xpdf/Stream.h	2008-05-08 15:40:41.000000000 +0200
+@@ -5,6 +5,9 @@
+ // Copyright 1996-2003 Glyph & Cog, LLC
+ //
+ //========================================================================
++//  Modified for TeX Live by Peter Breitenlohner <tex-live@tug.org>
++//  See top-level ChangeLog for a list of all modifications
++//========================================================================
+ 
+ #ifndef STREAM_H
+ #define STREAM_H
+@@ -34,6 +37,7 @@
+   strFlate,
+   strJBIG2,
+   strJPX,
++  strCrypt,
+   strWeird			// internal-use stream types
+ };
+ 
diff --git a/Build/source/libs/xpdf/xpdf-3.02-PATCHES/patch-20-pdftex b/Build/source/libs/xpdf/xpdf-3.02-PATCHES/patch-20-pdftex
index dccc4f6bb04..b4d71a8748b 100644
--- a/Build/source/libs/xpdf/xpdf-3.02-PATCHES/patch-20-pdftex
+++ b/Build/source/libs/xpdf/xpdf-3.02-PATCHES/patch-20-pdftex
@@ -4,28 +4,6 @@
 		Han The Thanh <thanh@pdftex.org>
 		Martin Schroeder <martin@pdftex.org>
 
-diff -ur -N xpdf-3.02.orig/goo/GString.cc xpdf-3.02/goo/GString.cc
---- xpdf-3.02.orig/goo/GString.cc	2007-02-27 23:05:51.000000000 +0100
-+++ xpdf-3.02/goo/GString.cc	2008-05-08 15:40:41.000000000 +0200
-@@ -7,6 +7,9 @@
- // Copyright 1996-2003 Glyph & Cog, LLC
- //
- //========================================================================
-+//  Modified for TeX Live by Peter Breitenlohner <tex-live@tug.org>
-+//  See top-level ChangeLog for a list of all modifications
-+//========================================================================
- 
- #include <aconf.h>
- 
-@@ -528,7 +531,7 @@
-   if ((neg = x < 0)) {
-     x = -x;
-   }
--  x = floor(x * pow(10, prec) + 0.5);
-+  x = floor(x * pow(10.0, prec) + 0.5);
-   i = bufSize;
-   started = !trim;
-   for (j = 0; j < prec && i > 1; ++j) {
 diff -ur -N xpdf-3.02.orig/goo/gfile.cc xpdf-3.02/goo/gfile.cc
 --- xpdf-3.02.orig/goo/gfile.cc	2009-03-05 23:36:46.000000000 +0100
 +++ xpdf-3.02/goo/gfile.cc	2009-04-30 21:29:39.000000000 +0200
@@ -45,28 +23,6 @@ diff -ur -N xpdf-3.02.orig/goo/gfile.cc xpdf-3.02/goo/gfile.cc
  
  GBool executeCommand(char *cmd) {
  #ifdef VMS
-diff -ur -N xpdf-3.02.orig/xpdf/Decrypt.h xpdf-3.02/xpdf/Decrypt.h
---- xpdf-3.02.orig/xpdf/Decrypt.h	2007-02-27 23:05:52.000000000 +0100
-+++ xpdf-3.02/xpdf/Decrypt.h	2008-05-08 15:40:41.000000000 +0200
-@@ -5,6 +5,9 @@
- // Copyright 1996-2003 Glyph & Cog, LLC
- //
- //========================================================================
-+//  Modified for TeX Live by Peter Breitenlohner <tex-live@tug.org>
-+//  See top-level ChangeLog for a list of all modifications
-+//========================================================================
- 
- #ifndef DECRYPT_H
- #define DECRYPT_H
-@@ -73,7 +76,7 @@
- 		CryptAlgorithm algoA, int keyLength,
- 		int objNum, int objGen);
-   virtual ~DecryptStream();
--  virtual StreamKind getKind() { return strWeird; }
-+  virtual StreamKind getKind() { return strCrypt; }
-   virtual void reset();
-   virtual int getChar();
-   virtual int lookChar();
 diff -ur -N xpdf-3.02.orig/xpdf/GlobalParams.cc xpdf-3.02/xpdf/GlobalParams.cc
 --- xpdf-3.02.orig/xpdf/GlobalParams.cc	2009-04-02 10:22:18.000000000 +0200
 +++ xpdf-3.02/xpdf/GlobalParams.cc	2009-04-30 21:35:00.000000000 +0200
@@ -393,39 +349,6 @@ diff -ur -N xpdf-3.02.orig/xpdf/GlobalParams.h xpdf-3.02/xpdf/GlobalParams.h
    GBool printCommands;		// print the drawing commands
    GBool errQuiet;		// suppress error messages?
  
-diff -ur -N xpdf-3.02.orig/xpdf/PDFDoc.h xpdf-3.02/xpdf/PDFDoc.h
---- xpdf-3.02.orig/xpdf/PDFDoc.h	2007-02-27 23:05:52.000000000 +0100
-+++ xpdf-3.02/xpdf/PDFDoc.h	2008-07-17 02:29:04.000000000 +0200
-@@ -5,6 +5,9 @@
- // Copyright 1996-2003 Glyph & Cog, LLC
- //
- //========================================================================
-+//  Modified for TeX Live by Peter Breitenlohner <tex-live@tug.org>
-+//  See top-level ChangeLog for a list of all modifications
-+//========================================================================
- 
- #ifndef PDFDOC_H
- #define PDFDOC_H
-@@ -171,13 +174,15 @@
-   double pdfVersion;
-   XRef *xref;
-   Catalog *catalog;
-+  GBool ok;
-+  int errCode;
-+/* Keep the size of the structure the same whether DISABLE_OUTLINE or
-+   not, and put it last to try to find errors more quickly.  */
- #ifndef DISABLE_OUTLINE
-   Outline *outline;
-+#else
-+  void *dummy;
- #endif
--
--
--  GBool ok;
--  int errCode;
- };
- 
- #endif
 diff -ur -N xpdf-3.02.orig/xpdf/Page.h xpdf-3.02/xpdf/Page.h
 --- xpdf-3.02.orig/xpdf/Page.h	2007-02-27 23:05:52.000000000 +0100
 +++ xpdf-3.02/xpdf/Page.h	2008-05-08 15:40:41.000000000 +0200
@@ -451,27 +374,6 @@ diff -ur -N xpdf-3.02.orig/xpdf/Page.h xpdf-3.02/xpdf/Page.h
  
  private:
  
-diff -ur -N xpdf-3.02.orig/xpdf/Stream.h xpdf-3.02/xpdf/Stream.h
---- xpdf-3.02.orig/xpdf/Stream.h	2007-11-12 13:27:21.000000000 +0100
-+++ xpdf-3.02/xpdf/Stream.h	2008-05-08 15:40:41.000000000 +0200
-@@ -5,6 +5,9 @@
- // Copyright 1996-2003 Glyph & Cog, LLC
- //
- //========================================================================
-+//  Modified for TeX Live by Peter Breitenlohner <tex-live@tug.org>
-+//  See top-level ChangeLog for a list of all modifications
-+//========================================================================
- 
- #ifndef STREAM_H
- #define STREAM_H
-@@ -34,6 +37,7 @@
-   strFlate,
-   strJBIG2,
-   strJPX,
-+  strCrypt,
-   strWeird			// internal-use stream types
- };
- 
 diff -ur -N xpdf-3.02.orig/xpdf/XRef.cc xpdf-3.02/xpdf/XRef.cc
 --- xpdf-3.02.orig/xpdf/XRef.cc	2007-02-27 23:05:52.000000000 +0100
 +++ xpdf-3.02/xpdf/XRef.cc	2008-05-08 15:40:41.000000000 +0200