diff options
| author | Ocke Janssen [oj] <Ocke.Janssen@oracle.com> | 2011-02-03 12:19:25 +0100 |
|---|---|---|
| committer | Ocke Janssen [oj] <Ocke.Janssen@oracle.com> | 2011-02-03 12:19:25 +0100 |
| commit | 9bfb748bd65b239e2542596f1d3ca39fb81b350f (patch) | |
| tree | fca300a45a8dee762e27a167a8fe4e232b94880c /xpdf/xpdf-3.02.patch | |
| parent | Automated merge with ssh://hg@hg.services.openoffice.org/cws/dba34b (diff) | |
| parent | #i10000# removed obsolete second patch (diff) | |
| download | core-9bfb748bd65b239e2542596f1d3ca39fb81b350f.tar.gz core-9bfb748bd65b239e2542596f1d3ca39fb81b350f.zip | |
merge from master
Diffstat (limited to 'xpdf/xpdf-3.02.patch')
| -rw-r--r-- | xpdf/xpdf-3.02.patch | 29 |
1 files changed, 29 insertions, 0 deletions
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(); |