core.git: drawinglayer/source

[Noel Grandin (via logerrit)]

 drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx |   18 +++++------
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit e1cd4c02ae23db6dc39d3d84b46f350772eab209
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Mon Sep 1 13:46:50 2025 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Sep 2 07:53:39 2025 +0200

    BitmapEx->Bitmap in AnimatedGraphicPrimitive2D
    
    now that Bitmap supports transparency
    
    Change-Id: Ifb268c51fce35881d3f4219670c925716c42a054
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190486
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
    Tested-by: Jenkins

diff --git a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx 
b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
index 8bfa411130de..734bca456f66 100644
--- a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
+++ b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
@@ -181,7 +181,7 @@ namespace drawinglayer::primitive2d
 
             Primitive2DReference createFromBuffer() const
             {
-                // create BitmapEx by extracting from VirtualDevices
+                // create Bitmap by extracting from VirtualDevices
                 const Bitmap aMainBitmap(maVirtualDevice->GetBitmap(Point(), 
maVirtualDevice->GetOutputSizePixel()));
                 bool useAlphaMask = false;
 #if defined(MACOSX) || defined(IOS)
@@ -191,25 +191,25 @@ namespace drawinglayer::primitive2d
                 if( SkiaHelper::isVCLSkiaEnabled())
                     useAlphaMask = true;
 #endif
-                BitmapEx bitmap;
+                Bitmap bitmap;
                 if( useAlphaMask )
                 {
                     const AlphaMask 
aMaskBitmap(maVirtualDeviceMask->GetBitmap(Point(), 
maVirtualDeviceMask->GetOutputSizePixel()));
-                    bitmap = BitmapEx(aMainBitmap, aMaskBitmap);
+                    bitmap = Bitmap(aMainBitmap, aMaskBitmap);
                 }
                 else
                 {
                     Bitmap aMaskBitmap(maVirtualDeviceMask->GetBitmap(Point(), 
maVirtualDeviceMask->GetOutputSizePixel()));
                     // tdf#156630 invert the alpha mask
                     aMaskBitmap.Invert(); // convert from transparency to alpha
-                    bitmap = BitmapEx(aMainBitmap, aMaskBitmap);
+                    bitmap = Bitmap(aMainBitmap, aMaskBitmap);
                 }
 
                 if (!maFillGraphicAttribute.isDefault())
                 {
                     // need to create FillGraphicPrimitive2D
                     const drawinglayer::attribute::FillGraphicAttribute 
aAttribute(
-                        Graphic(Bitmap(bitmap)),
+                        Graphic(bitmap),
                         maFillGraphicAttribute.getGraphicRange(),
                         maFillGraphicAttribute.getTiling(),
                         maFillGraphicAttribute.getOffsetX(),
@@ -223,9 +223,9 @@ namespace drawinglayer::primitive2d
 
                 // need to create BitmapAlphaPrimitive2D/BitmapPrimitive2D
                 if (basegfx::fTools::equal(getTransparency(), 0.0))
-                    return new BitmapPrimitive2D(Bitmap(bitmap), 
getTransform());
+                    return new BitmapPrimitive2D(bitmap, getTransform());
 
-                return new BitmapAlphaPrimitive2D(Bitmap(bitmap), 
getTransform(), getTransparency());
+                return new BitmapAlphaPrimitive2D(bitmap, getTransform(), 
getTransparency());
             }
 
             void checkSafeToBuffer(sal_uInt32 nIndex)
@@ -314,7 +314,7 @@ namespace drawinglayer::primitive2d
                             else
                             {
                                 AlphaMask aAlphaMask = 
rAnimationFrame.maBitmap.CreateAlphaMask();
-                                BitmapEx 
aExpandVisibilityMask(aAlphaMask.GetBitmap(), aAlphaMask);
+                                Bitmap 
aExpandVisibilityMask(aAlphaMask.GetBitmap(), aAlphaMask);
                                 
maVirtualDeviceMask->DrawBitmapEx(rAnimationFrame.maPositionPixel, 
aExpandVisibilityMask);
                             }
 
@@ -337,7 +337,7 @@ namespace drawinglayer::primitive2d
                             else
                             {
                                 const AlphaMask 
aMask(rAnimationFrame.maBitmap.CreateAlphaMask());
-                                BitmapEx 
aExpandVisibilityMask(aMask.GetBitmap(), aMask);
+                                Bitmap 
aExpandVisibilityMask(aMask.GetBitmap(), aMask);
                                 
maVirtualDeviceMask->DrawBitmapEx(rAnimationFrame.maPositionPixel, 
aExpandVisibilityMask);
                             }