summaryrefslogtreecommitdiff
path: root/canvas
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-05-30 15:06:39 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-05-31 08:30:42 +0200
commit8b0ded99e5f8d71c9b763db264ac445b5f665234 (patch)
tree7809fdb80842f964a63bf1921029970c7cf93ca1 /canvas
parent98630a6edf91183dbd8f1bdb02616889251927de (diff)
move some CanvasHelper::implDrawBitmap inside vcl
part of making mask and alpha internal details of Bitmap/BitmapEx Change-Id: I87ca24af18a29f5eb8a5761c5d95ae2806d97e77 Reviewed-on: https://gerrit.libreoffice.org/55078 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'canvas')
-rw-r--r--canvas/source/vcl/canvashelper.cxx12
1 files changed, 2 insertions, 10 deletions
diff --git a/canvas/source/vcl/canvashelper.cxx b/canvas/source/vcl/canvashelper.cxx
index d7005261558c..a6661c5d5609 100644
--- a/canvas/source/vcl/canvashelper.cxx
+++ b/canvas/source/vcl/canvashelper.cxx
@@ -46,7 +46,7 @@
#include <vcl/bitmapaccess.hxx>
#include <vcl/canvastools.hxx>
#include <vcl/window.hxx>
-#include <vcl/BitmapMonochromeFilter.hxx>
+#include <vcl/BitmapAlphaClampFilter.hxx>
#include <canvas/canvastools.hxx>
@@ -720,15 +720,7 @@ namespace vclcanvas
// transparency is fully transparent
if( aBmpEx.IsAlpha() )
{
- Bitmap aMask( aBmpEx.GetAlpha().GetBitmap() );
- BitmapEx aMaskEx(aMask);
- BitmapFilter::Filter(aMaskEx, BitmapMonochromeFilter(253));
- aMask = aMaskEx.GetBitmap();
- aBmpEx = BitmapEx( aBmpEx.GetBitmap(), aMask );
- }
- else if( aBmpEx.IsTransparent() )
- {
- aBmpEx = BitmapEx( aBmpEx.GetBitmap(), aBmpEx.GetMask() );
+ BitmapFilter::Filter(aBmpEx, BitmapAlphaClampFilter(253));
}
mp2ndOutDevProvider->getOutDev().DrawBitmapEx( vcl::unotools::pointFromB2DPoint( aOutputPos ),