diff options
| author | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2011-02-16 15:57:58 +0100 |
|---|---|---|
| committer | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2011-02-16 15:57:58 +0100 |
| commit | f575b9b55f183f4b76369a05d6c9a3f974e24a30 (patch) | |
| tree | 91c4ec59fa7c98bd0d12e30bf2345b2da9ad0a07 /xpdf | |
| parent | 35a00059b6ce4f841c750445e242d905c1f87c24 (diff) | |
| parent | 1e8a573baae510633c90e457b6c47c04b7dff132 (diff) | |
rebase to DEV300_m100
Diffstat (limited to 'xpdf')
| -rw-r--r-- | xpdf/makefile.mk | 2 | ||||
| -rw-r--r-- | xpdf/xpdf-3.02-sec.patch | 29 | ||||
| -rw-r--r-- | xpdf/xpdf-3.02.patch | 29 |
3 files changed, 30 insertions, 30 deletions
diff --git a/xpdf/makefile.mk b/xpdf/makefile.mk index 482df3ba934a..191eefd50e2b 100644 --- a/xpdf/makefile.mk +++ b/xpdf/makefile.mk @@ -48,7 +48,7 @@ dummy: TARFILE_NAME=xpdf-3.02 TARFILE_MD5=599dc4cc65a07ee868cf92a667a913d2 -PATCH_FILES=$(TARFILE_NAME).patch xpdf-3.02-sec.patch xpdf-3.02-ooopwd.patch +PATCH_FILES=$(TARFILE_NAME).patch xpdf-3.02-ooopwd.patch CONFIGURE_DIR= BUILD_DIR=$(CONFIGURE_DIR) diff --git a/xpdf/xpdf-3.02-sec.patch b/xpdf/xpdf-3.02-sec.patch deleted file mode 100644 index a33b85e8ab17..000000000000 --- a/xpdf/xpdf-3.02-sec.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- misc/xpdf-3.02/fofi/FoFiType1.cc 2007-02-27 23:05:51.000000000 +0100 -+++ misc/build/xpdf-3.02/fofi/FoFiType1.cc 2010-10-20 18:10:09.000000000 +0200 -@@ -224,7 +224,7 @@ - code = code * 8 + (*p2 - '0'); - } - } -- if (code < 256) { -+ if (code < 256 && code >= 0) { - for (p = p2; *p == ' ' || *p == '\t'; ++p) ; - if (*p == '/') { - ++p; ---- misc/xpdf-3.02/xpdf/Gfx.cc 2007-02-27 23:05:52.000000000 +0100 -+++ misc/build/xpdf-3.02/xpdf/Gfx.cc 2010-10-20 18:14:32.000000000 +0200 -@@ -444,6 +444,7 @@ - xref = xrefA; - subPage = gFalse; - printCommands = globalParams->getPrintCommands(); -+ parser = NULL; - - // start the resource stack - res = new GfxResources(xref, resDict, NULL); -@@ -486,6 +487,7 @@ - xref = xrefA; - subPage = gTrue; - printCommands = globalParams->getPrintCommands(); -+ parser = NULL; - - // start the resource stack - res = new GfxResources(xref, resDict, NULL); diff --git a/xpdf/xpdf-3.02.patch b/xpdf/xpdf-3.02.patch index 341ad73132a2..9477f7a31d4a 100644 --- a/xpdf/xpdf-3.02.patch +++ b/xpdf/xpdf-3.02.patch @@ -1870,3 +1870,32 @@ } objStr->getObject(e->gen, num, obj); break; +--- misc/xpdf-3.02/fofi/FoFiType1.cc 2007-02-27 23:05:51.000000000 +0100 ++++ misc/build/xpdf-3.02/fofi/FoFiType1.cc 2011-01-04 13:41:06.871136746 +0100 +@@ -224,7 +224,7 @@ + code = code * 8 + (*p2 - '0'); + } + } +- if (code < 256) { ++ if (code < 256 && code >= 0) { + for (p = p2; *p == ' ' || *p == '\t'; ++p) ; + if (*p == '/') { + ++p; +--- misc/xpdf-3.02/xpdf/Gfx.cc 2007-02-27 23:05:52.000000000 +0100 ++++ misc/build/xpdf-3.02/xpdf/Gfx.cc 2011-01-04 13:41:19.847501431 +0100 +@@ -441,6 +441,7 @@ + void *abortCheckCbkDataA) { + int i; + ++ parser = NULL; + xref = xrefA; + subPage = gFalse; + printCommands = globalParams->getPrintCommands(); +@@ -483,6 +484,7 @@ + void *abortCheckCbkDataA) { + int i; + ++ parser = NULL; + xref = xrefA; + subPage = gTrue; + printCommands = globalParams->getPrintCommands(); |