ooo-build r12128 - in trunk: . patches/src680

[thorstenb svn gnome org]

Author: thorstenb
Date: Tue Apr  8 11:40:18 2008
New Revision: 12128
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12128&view=rev

Log:
	* patches/src680/vcl-gcache-missing-initialisation.diff: taking Caolan's
	patch from issue i#88005 also for 2.4



Added:
   trunk/patches/src680/vcl-gcache-missing-initialisation.diff
Modified:
   trunk/ChangeLog
   trunk/patches/src680/apply

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Tue Apr  8 11:40:18 2008
@@ -463,6 +463,9 @@
 # init all members in VirDev's ctor
 vcl-virdev-missing-initialisation.diff, thorsten
 
+# only use value if initialized
+vcl-gcache-missing-initialisation.diff, i#88005, thorsten
+
 # don't use freed memory in slidesorter
 sd-slidesorter-dead-ptr.diff, i#88002, thorsten
 

Added: trunk/patches/src680/vcl-gcache-missing-initialisation.diff
==============================================================================
--- (empty file)
+++ trunk/patches/src680/vcl-gcache-missing-initialisation.diff	Tue Apr  8 11:40:18 2008
@@ -0,0 +1,11 @@
+--- vcl/source/glyphs/gcach_rbmp.cxx	27 Jun 2007 20:25:11 -0000	1.8
++++ vcl/source/glyphs/gcach_rbmp.cxx	7 Apr 2008 10:52:55 -0000
+@@ -160,7 +160,7 @@
+                 nTemp = 1;
+             }
+             // update input byte if needed
+-            if( (nInp >>= 1) <= 1 )
++            if( ( (nInp >>= 1) <= 1 ) && (!(y == 0 && x == 0)) )
+                 nInp = 0x100 + *(--p2);
+         }
+