diff options
| author | Petr Mladek <pmladek@suse.cz> | 2011-01-07 20:17:46 +0100 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2011-01-07 20:17:46 +0100 |
| commit | ec5f38a2226bfc5e703eb711f9ecabc72bda32aa (patch) | |
| tree | be3ba7633a23f842b9e8b6b49dc3b2f9edd19c8e | |
| parent | a248774253dd59f35f409b651e73728c897d612a (diff) | |
| parent | 62c3f9fe80c65e1e6cea447eefba7e3aa552bec9 (diff) | |
Merge commit 'ooo/OOO330_m19' into libreoffice-3-3
| -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 341ad73..9477f7a 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(); |