From 1f6af5c409105562edf2a034f4841c1aeb5a38b5 Mon Sep 17 00:00:00 2001 From: Chris Sherlock Date: Sun, 22 Apr 2018 22:33:40 +1000 Subject: vcl: move Bitmap::MakeMonochrome() to BitmapMonochromeFilter MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Iefe5be4349475a4aa0138534cf6bfe87ff7df245 Reviewed-on: https://gerrit.libreoffice.org/53280 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl --- canvas/source/vcl/canvashelper.cxx | 6 ++++-- canvas/source/vcl/spritehelper.cxx | 5 ++++- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'canvas') diff --git a/canvas/source/vcl/canvashelper.cxx b/canvas/source/vcl/canvashelper.cxx index d31a45286dc3..5a0a74e389d2 100644 --- a/canvas/source/vcl/canvashelper.cxx +++ b/canvas/source/vcl/canvashelper.cxx @@ -46,6 +46,7 @@ #include #include #include +#include #include @@ -720,8 +721,9 @@ namespace vclcanvas if( aBmpEx.IsAlpha() ) { Bitmap aMask( aBmpEx.GetAlpha().GetBitmap() ); - aMask.MakeMonochrome(253); - aBmpEx = BitmapEx( aBmpEx.GetBitmap(), aMask ); + BitmapEx aMaskEx(aMask); + BitmapFilter::Filter(aMaskEx, BitmapMonochromeFilter(253)); + aMask = aMaskEx.GetBitmap(); } else if( aBmpEx.IsTransparent() ) { diff --git a/canvas/source/vcl/spritehelper.cxx b/canvas/source/vcl/spritehelper.cxx index 366d0a5b9829..9424d4ec54b9 100644 --- a/canvas/source/vcl/spritehelper.cxx +++ b/canvas/source/vcl/spritehelper.cxx @@ -36,6 +36,7 @@ #include #include #include +#include #include @@ -153,7 +154,9 @@ namespace vclcanvas { OSL_FAIL("CanvasCustomSprite::redraw(): Mask bitmap is not " "monochrome (performance!)"); - aMask.MakeMonochrome(255); + BitmapEx aMaskEx(aMask); + BitmapFilter::Filter(aMaskEx, BitmapMonochromeFilter(255)); + aMask = aMaskEx.GetBitmap(); } #endif -- cgit