ooo-build r11713 - in trunk: . patches/emf+

[tml svn gnome org]

Author: tml
Date: Wed Feb 27 00:06:34 2008
New Revision: 11713
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11713&view=rev

Log:
2008-02-26  Tor Lillqvist  <tml novell com>

	* patches/emf+/emf+-dxcanvas.diff
	(canvas/source/directx/dx_canvasbitmap.cxx): Fix memory allocation
	error. nScanWidth was calculated incorrectly. No crash now, but
	still no chart visible in Calc either.



Modified:
   trunk/ChangeLog
   trunk/patches/emf+/emf+-dxcanvas.diff

Modified: trunk/patches/emf+/emf+-dxcanvas.diff
==============================================================================
--- trunk/patches/emf+/emf+-dxcanvas.diff	(original)
+++ trunk/patches/emf+/emf+-dxcanvas.diff	Wed Feb 27 00:06:34 2008
@@ -240,7 +240,7 @@
 +                    }
 +
 +                    // copy only alpha channel to pAlphaBits
-+                    const sal_Int32 nScanWidth((aSize.getX() + 3) & 4);
++                    const sal_Int32 nScanWidth((aSize.getX() + 3) & ~3);
 +                    boost::scoped_array<sal_uInt8> pAlphaBits( new sal_uInt8[nScanWidth*aSize.getY()] );
 +                    const sal_uInt8* pInBits=(sal_uInt8*)aBmpData.Scan0;
 +                    pInBits+=3;