[Libreoffice-commits] .: Branch 'libreoffice-3-3' - 3 commits - xpdf/xpdf-3.02.patch

[Petr Mladek]

 xpdf/xpdf-3.02.patch |   29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

New commits:
commit ec5f38a2226bfc5e703eb711f9ecabc72bda32aa
Merge: a248774... 62c3f9f...
Author: Petr Mladek <pmladek at suse.cz>
Date:   Fri Jan 7 20:17:46 2011 +0100

    Merge commit 'ooo/OOO330_m19' into libreoffice-3-3

commit 62c3f9fe80c65e1e6cea447eefba7e3aa552bec9
Merge: c6467fe... 8cdda01...
Author: Kurt Zenker <kz at openoffice.org>
Date:   Thu Jan 6 14:58:44 2011 +0100

    CWS-TOOLING: integrate CWS impress208

commit 8cdda010620a019aa5203c7d0422fad654e503b8
Author: Christian Lippka <christian.lippka at oracle.com>
Date:   Tue Jan 4 13:46:35 2011 +0100

    impress208: #164351# patching xpdf to patchlevel 3.02pl5

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();