[Libreoffice-commits] core.git: canvas/source

[Noel Grandin]

 canvas/source/vcl/canvashelper.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit ed9f0e3bc2b5b205aba9475d3bcb314dcb76ce5d
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Wed May 30 14:34:54 2018 +0200

    fix "vcl: move Bitmap::MakeMonochrome() to BitmapMonochromeFilter"
    
    commit 1f6af5c409105562edf2a034f4841c1aeb5a38b5
    "vcl: move Bitmap::MakeMonochrome() to BitmapMonochromeFilter"
    seems to have dropped a line of code which means the filtering
    doesn't actually have an effect.
    
    Change-Id: If46c15bd9ab9d4e3911bdb9baf3091889b1f634d
    Reviewed-on: https://gerrit.libreoffice.org/55071
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/canvas/source/vcl/canvashelper.cxx b/canvas/source/vcl/canvashelper.cxx
index 5a0a74e389d2..d7005261558c 100644
--- a/canvas/source/vcl/canvashelper.cxx
+++ b/canvas/source/vcl/canvashelper.cxx
@@ -724,6 +724,7 @@ namespace vclcanvas
                         BitmapEx aMaskEx(aMask);
                         BitmapFilter::Filter(aMaskEx, BitmapMonochromeFilter(253));
                         aMask = aMaskEx.GetBitmap();
+                        aBmpEx = BitmapEx( aBmpEx.GetBitmap(), aMask );
                     }
                     else if( aBmpEx.IsTransparent() )
                     {