[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - vcl/source

[Tor Lillqvist]

 vcl/source/gdi/bitmap4.cxx |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit e34bfbd4a09e8d64b0d2cadea17676990ce35ae8
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Aug 26 16:24:31 2014 +0300

    bnc#719994: Fix the duotone filter to actually produce duotone
    
    Not sure what it tried to do earlier, but it was obviously wrong.
    
    Change-Id: I0b377c4baa88205a9a7ad7c134ec5bc2223e6205
    (cherry picked from commit c03f7f2b427f7fe2b94dfb55ea64670426d1a957)
    Reviewed-on: https://gerrit.libreoffice.org/11125
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/gdi/bitmap4.cxx b/vcl/source/gdi/bitmap4.cxx
index 8ebf477..594247c 100644
--- a/vcl/source/gdi/bitmap4.cxx
+++ b/vcl/source/gdi/bitmap4.cxx
@@ -1190,10 +1190,11 @@ bool Bitmap::ImplDuotoneFilter( const sal_uLong nColorOne, const sal_uLong nColo
         for( int y = 0; y < nHeight; y++ )
         {
             BitmapColor aColor = pReadAcc->GetColor( y, x );
+            sal_uInt8 luminance = aColor.GetLuminance();
             BitmapColor aResultColor(
-                    lcl_getDuotoneColorComponent( aColor.GetRed(), aColorOne.GetRed(), aColorTwo.GetRed() ) ,
-                    lcl_getDuotoneColorComponent( aColor.GetGreen(), aColorOne.GetGreen(), aColorTwo.GetGreen() ) ,
-                    lcl_getDuotoneColorComponent( aColor.GetBlue(), aColorOne.GetBlue(), aColorTwo.GetBlue() ) );
+                    lcl_getDuotoneColorComponent( luminance, aColorOne.GetRed(), aColorTwo.GetRed() ) ,
+                    lcl_getDuotoneColorComponent( luminance, aColorOne.GetGreen(), aColorTwo.GetGreen() ) ,
+                    lcl_getDuotoneColorComponent( luminance, aColorOne.GetBlue(), aColorTwo.GetBlue() ) );
             pWriteAcc->SetPixel( y, x, aResultColor );
         }
     }