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 --- slideshow/source/engine/shapes/gdimtftools.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'slideshow/source/engine/shapes/gdimtftools.cxx') diff --git a/slideshow/source/engine/shapes/gdimtftools.cxx b/slideshow/source/engine/shapes/gdimtftools.cxx index e3d22e5033f2..dfb33d95f38c 100644 --- a/slideshow/source/engine/shapes/gdimtftools.cxx +++ b/slideshow/source/engine/shapes/gdimtftools.cxx @@ -289,7 +289,7 @@ bool getAnimationFromGraphic( VectorOfMtfAnimationFrames& o_rFrames, { pVDev->DrawBitmapEx(rAnimationBitmap.maPositionPixel, rAnimationBitmap.maBitmapEx); - Bitmap aMask = rAnimationBitmap.maBitmapEx.GetMask(); + Bitmap aMask = rAnimationBitmap.maBitmapEx.GetAlpha(); if( aMask.IsEmpty() ) { @@ -311,7 +311,7 @@ bool getAnimationFromGraphic( VectorOfMtfAnimationFrames& o_rFrames, case Disposal::Back: { // #i70772# react on no mask - const Bitmap aMask(rAnimationBitmap.maBitmapEx.GetMask()); + const Bitmap aMask(rAnimationBitmap.maBitmapEx.GetAlpha()); const Bitmap & rContent(rAnimationBitmap.maBitmapEx.GetBitmap()); pVDevMask->Erase(); @@ -336,7 +336,7 @@ bool getAnimationFromGraphic( VectorOfMtfAnimationFrames& o_rFrames, pVDev->DrawBitmapEx(rAnimationBitmap.maPositionPixel, rAnimationBitmap.maBitmapEx); pVDevMask->DrawBitmap(rAnimationBitmap.maPositionPixel, - rAnimationBitmap.maBitmapEx.GetMask()); + rAnimationBitmap.maBitmapEx.GetAlpha()); break; } } -- cgit