[Libreoffice-commits] core.git: include/vcl

Tor Lillqvist tml at collabora.com
Thu Mar 19 11:14:30 PDT 2015


 include/vcl/salbtype.hxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 33d2475d9f2f01308ba4675ac99aaabb43870e0f
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Mar 19 20:13:01 2015 +0200

    Revert "Dr.Memory complains about this..."
    
    Obviously some thinko, does not compile.
    
    This reverts commit 684aec5496f7394969743614cfda12b11c0466af.

diff --git a/include/vcl/salbtype.hxx b/include/vcl/salbtype.hxx
index 1dd62c2..40dfd8f 100644
--- a/include/vcl/salbtype.hxx
+++ b/include/vcl/salbtype.hxx
@@ -406,7 +406,7 @@ inline BitmapColor& BitmapColor::Invert()
 inline sal_uInt8 BitmapColor::GetLuminance() const
 {
     DBG_ASSERT( !mbIndex, "Pixel represents index into colortable!" );
-    return (unsigned long(mcBlueOrIndex) * 28UL + unsigned long(mcGreen) * 151UL + unsigned long(mcRed) * 77UL) >> 8;
+    return( (sal_uInt8) ( ( mcBlueOrIndex * 28UL + mcGreen * 151UL + mcRed * 77UL ) >> 8UL ) );
 }
 
 inline BitmapColor& BitmapColor::IncreaseLuminance( sal_uInt8 cGreyInc )


More information about the Libreoffice-commits mailing list