diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-08-26 16:24:31 +0300 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-08-26 09:17:27 -0500 |
| commit | a19c6beaddf13df6f62bd347e7220f3f741e9979 (patch) | |
| tree | 4a3d02721e11b20c45dee2896e2765c528a638ce /vcl | |
| parent | 4eaa74690d2c35acc3668a2016a23c9d111e2d3f (diff) | |
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/11127
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/gdi/bitmap4.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/vcl/source/gdi/bitmap4.cxx b/vcl/source/gdi/bitmap4.cxx index dbda9e68d4e8..04ca76da5ba9 100644 --- a/vcl/source/gdi/bitmap4.cxx +++ b/vcl/source/gdi/bitmap4.cxx @@ -1192,10 +1192,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 ); } } |