summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2010-10-25 09:35:40 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2010-10-25 09:35:40 +0000
commitff6430aab33f47525723d44443e158766c1fc39d (patch)
tree2451f956154b808a34add82526552c06bfd1244d /Build
parent339aae5be48169152fdff5dbe2f64b6be4f5763c (diff)
apply xpdf 3.02pl5 patch
git-svn-id: svn://tug.org/texlive/trunk@20194 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/libs/xpdf/xpdf-3.02-PATCHES/ChangeLog5
-rw-r--r--Build/source/libs/xpdf/xpdf-3.02-PATCHES/patch-05-pl543
-rw-r--r--Build/source/libs/xpdf/xpdf-3.02-foolabs/xpdf-3.02pl5.patch41
-rw-r--r--Build/source/libs/xpdf/xpdf-3.02/fofi/FoFiType1.cc2
-rw-r--r--Build/source/libs/xpdf/xpdf-3.02/xpdf/Gfx.cc2
-rw-r--r--Build/source/libs/xpdf/xpdf-3.02/xpdf/config.h2
6 files changed, 93 insertions, 2 deletions
diff --git a/Build/source/libs/xpdf/xpdf-3.02-PATCHES/ChangeLog b/Build/source/libs/xpdf/xpdf-3.02-PATCHES/ChangeLog
index e3159e126dc..a38af8df520 100644
--- a/Build/source/libs/xpdf/xpdf-3.02-PATCHES/ChangeLog
+++ b/Build/source/libs/xpdf/xpdf-3.02-PATCHES/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-25 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-05-pl5 (new): Official 3.02pl5 patch plus change of
+ xpdfVersion "3.02pl4" -> "3.02pl5"
+
2010-04-13 Peter Breitenlohner <peb@mppmu.mpg.de>
* patch-45-getmetadatanf (removed): unnecessary.
diff --git a/Build/source/libs/xpdf/xpdf-3.02-PATCHES/patch-05-pl5 b/Build/source/libs/xpdf/xpdf-3.02-PATCHES/patch-05-pl5
new file mode 100644
index 00000000000..49bb8433238
--- /dev/null
+++ b/Build/source/libs/xpdf/xpdf-3.02-PATCHES/patch-05-pl5
@@ -0,0 +1,43 @@
+diff -ur -N xpdf-3.02.orig/fofi/FoFiType1.cc xpdf-3.02/fofi/FoFiType1.cc
+--- xpdf-3.02.orig/fofi/FoFiType1.cc 2007-02-27 23:05:51.000000000 +0100
++++ xpdf-3.02/fofi/FoFiType1.cc 2010-10-11 06:44:13.000000000 +0200
+@@ -224,7 +224,7 @@
+ code = code * 8 + (*p2 - '0');
+ }
+ }
+- if (code < 256) {
++ if (code >= 0 && code < 256) {
+ for (p = p2; *p == ' ' || *p == '\t'; ++p) ;
+ if (*p == '/') {
+ ++p;
+diff -ur -N xpdf-3.02.orig/xpdf/Gfx.cc xpdf-3.02/xpdf/Gfx.cc
+--- xpdf-3.02.orig/xpdf/Gfx.cc 2007-02-27 23:05:52.000000000 +0100
++++ xpdf-3.02/xpdf/Gfx.cc 2010-10-11 06:39:52.000000000 +0200
+@@ -461,6 +461,7 @@
+ baseMatrix[i] = state->getCTM()[i];
+ }
+ formDepth = 0;
++ parser = NULL;
+ abortCheckCbk = abortCheckCbkA;
+ abortCheckCbkData = abortCheckCbkDataA;
+
+@@ -500,6 +501,7 @@
+ baseMatrix[i] = state->getCTM()[i];
+ }
+ formDepth = 0;
++ parser = NULL;
+ abortCheckCbk = abortCheckCbkA;
+ abortCheckCbkData = abortCheckCbkDataA;
+
+diff -ur -N xpdf-3.02.orig/xpdf/config.h xpdf-3.02/xpdf/config.h
+--- xpdf-3.02.orig/xpdf/config.h 2009-10-15 13:37:21.000000000 +0200
++++ xpdf-3.02/xpdf/config.h 2010-10-25 11:09:37.000000000 +0200
+@@ -17,7 +17,7 @@
+ //------------------------------------------------------------------------
+
+ // xpdf version
+-#define xpdfVersion "3.02pl4"
++#define xpdfVersion "3.02pl5"
+ #define xpdfVersionNum 3.02
+ #define xpdfMajorVersion 3
+ #define xpdfMinorVersion 2
diff --git a/Build/source/libs/xpdf/xpdf-3.02-foolabs/xpdf-3.02pl5.patch b/Build/source/libs/xpdf/xpdf-3.02-foolabs/xpdf-3.02pl5.patch
new file mode 100644
index 00000000000..558eac5548b
--- /dev/null
+++ b/Build/source/libs/xpdf/xpdf-3.02-foolabs/xpdf-3.02pl5.patch
@@ -0,0 +1,41 @@
+*** xpdf-3.02.orig/xpdf/Gfx.cc Tue Feb 27 14:05:52 2007
+--- xpdf-3.02/xpdf/Gfx.cc Mon Oct 11 15:39:52 2010
+***************
+*** 461,466 ****
+--- 461,467 ----
+ baseMatrix[i] = state->getCTM()[i];
+ }
+ formDepth = 0;
++ parser = NULL;
+ abortCheckCbk = abortCheckCbkA;
+ abortCheckCbkData = abortCheckCbkDataA;
+
+***************
+*** 500,505 ****
+--- 501,507 ----
+ baseMatrix[i] = state->getCTM()[i];
+ }
+ formDepth = 0;
++ parser = NULL;
+ abortCheckCbk = abortCheckCbkA;
+ abortCheckCbkData = abortCheckCbkDataA;
+
+*** xpdf-3.02.orig/fofi/FoFiType1.cc Tue Feb 27 14:05:51 2007
+--- xpdf-3.02/fofi/FoFiType1.cc Mon Oct 11 15:44:13 2010
+***************
+*** 224,230 ****
+ code = code * 8 + (*p2 - '0');
+ }
+ }
+! if (code < 256) {
+ for (p = p2; *p == ' ' || *p == '\t'; ++p) ;
+ if (*p == '/') {
+ ++p;
+--- 224,230 ----
+ code = code * 8 + (*p2 - '0');
+ }
+ }
+! if (code >= 0 && code < 256) {
+ for (p = p2; *p == ' ' || *p == '\t'; ++p) ;
+ if (*p == '/') {
+ ++p;
diff --git a/Build/source/libs/xpdf/xpdf-3.02/fofi/FoFiType1.cc b/Build/source/libs/xpdf/xpdf-3.02/fofi/FoFiType1.cc
index efad5ee4eb7..8a53b4cac47 100644
--- a/Build/source/libs/xpdf/xpdf-3.02/fofi/FoFiType1.cc
+++ b/Build/source/libs/xpdf/xpdf-3.02/fofi/FoFiType1.cc
@@ -224,7 +224,7 @@ void FoFiType1::parse() {
code = code * 8 + (*p2 - '0');
}
}
- if (code < 256) {
+ if (code >= 0 && code < 256) {
for (p = p2; *p == ' ' || *p == '\t'; ++p) ;
if (*p == '/') {
++p;
diff --git a/Build/source/libs/xpdf/xpdf-3.02/xpdf/Gfx.cc b/Build/source/libs/xpdf/xpdf-3.02/xpdf/Gfx.cc
index b7655b62372..b7a1afcea6d 100644
--- a/Build/source/libs/xpdf/xpdf-3.02/xpdf/Gfx.cc
+++ b/Build/source/libs/xpdf/xpdf-3.02/xpdf/Gfx.cc
@@ -461,6 +461,7 @@ Gfx::Gfx(XRef *xrefA, OutputDev *outA, int pageNum, Dict *resDict,
baseMatrix[i] = state->getCTM()[i];
}
formDepth = 0;
+ parser = NULL;
abortCheckCbk = abortCheckCbkA;
abortCheckCbkData = abortCheckCbkDataA;
@@ -500,6 +501,7 @@ Gfx::Gfx(XRef *xrefA, OutputDev *outA, Dict *resDict,
baseMatrix[i] = state->getCTM()[i];
}
formDepth = 0;
+ parser = NULL;
abortCheckCbk = abortCheckCbkA;
abortCheckCbkData = abortCheckCbkDataA;
diff --git a/Build/source/libs/xpdf/xpdf-3.02/xpdf/config.h b/Build/source/libs/xpdf/xpdf-3.02/xpdf/config.h
index ce3efc50784..516f7bd0ff9 100644
--- a/Build/source/libs/xpdf/xpdf-3.02/xpdf/config.h
+++ b/Build/source/libs/xpdf/xpdf-3.02/xpdf/config.h
@@ -17,7 +17,7 @@
//------------------------------------------------------------------------
// xpdf version
-#define xpdfVersion "3.02pl4"
+#define xpdfVersion "3.02pl5"
#define xpdfVersionNum 3.02
#define xpdfMajorVersion 3
#define xpdfMinorVersion 2