From ddd2639a482befb4a3bf1f75a88e66c21a691b67 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Sat, 27 Feb 2021 15:50:37 +0200 Subject: drop mask from BitmapEx So that we have fewer cases to deal with when we transition to 32-bit bitmaps. (*) rename maMask to maAlphaMask, since now it is only being used for alpha duties. (*) drop mbAlpha and mbTransparent to simplify state management, the only thing we need to check for alpha is if maAlphaMask is non-empty. Change-Id: I06252e38e950e846a94b4c2ba8ea763be17801fe Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111679 Tested-by: Jenkins Reviewed-by: Noel Grandin --- forms/source/component/imgprod.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'forms') diff --git a/forms/source/component/imgprod.cxx b/forms/source/component/imgprod.cxx index 9bbf54b388ae..5446b2082af7 100644 --- a/forms/source/component/imgprod.cxx +++ b/forms/source/component/imgprod.cxx @@ -363,7 +363,7 @@ void ImageProducer::ImplUpdateConsumer( const Graphic& rGraphic ) if( !pBmpAcc ) return; - Bitmap aMask( aBmpEx.GetMask() ); + Bitmap aMask( aBmpEx.GetAlpha() ); BitmapReadAccess* pMskAcc = !aMask.IsEmpty() ? aMask.AcquireReadAccess() : nullptr; const tools::Long nWidth = pBmpAcc->Width(); const tools::Long nHeight = pBmpAcc->Height(); -- cgit