[Libreoffice-commits] core.git: vcl/source

[Noel Grandin (via logerrit)]

 vcl/source/bitmap/BitmapEx.cxx |   11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

New commits:
commit 52512614d27d0dfe6ff94a738ed3b0cd477ef251
Author:     Noel Grandin <noelgran...@gmail.com>
AuthorDate: Sat Dec 2 15:38:57 2023 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Dec 2 21:27:15 2023 +0100

    Simplify some AlphaMask code
    
    AlphaMask has an operator=, no need for extra complication
    
    Change-Id: Ib0f4aba4e1c9a4a594cc1cbc92f3a335dc9295a8
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160243
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/vcl/source/bitmap/BitmapEx.cxx b/vcl/source/bitmap/BitmapEx.cxx
index 1ef50dc5d6a7..84c14cae4b7c 100644
--- a/vcl/source/bitmap/BitmapEx.cxx
+++ b/vcl/source/bitmap/BitmapEx.cxx
@@ -65,7 +65,7 @@ BitmapEx::BitmapEx( const BitmapEx& rBitmapEx, Point aSrc, 
Size aSize )
     maBitmap = Bitmap(aSize, rBitmapEx.maBitmap.getPixelFormat());
     SetSizePixel(aSize);
     if( rBitmapEx.IsAlpha() )
-        maAlphaMask = AlphaMask( aSize ).ImplGetBitmap();
+        maAlphaMask = AlphaMask( aSize );
 
     tools::Rectangle aDestRect( Point( 0, 0 ), aSize );
     tools::Rectangle aSrcRect( aSrc, aSize );
@@ -149,7 +149,7 @@ BitmapEx::BitmapEx( const Bitmap& rBmp, const Bitmap& rMask 
) :
 
 BitmapEx::BitmapEx( const Bitmap& rBmp, const AlphaMask& rAlphaMask ) :
         maBitmap         ( rBmp ),
-        maAlphaMask      ( rAlphaMask.ImplGetBitmap() ),
+        maAlphaMask      ( rAlphaMask ),
         maBitmapSize     ( maBitmap.GetSizePixel() )
 {
     if (!maBitmap.IsEmpty() && !maAlphaMask.IsEmpty() && 
maBitmap.GetSizePixel() != maAlphaMask.GetSizePixel())
@@ -438,10 +438,7 @@ bool BitmapEx::CopyPixel( const tools::Rectangle& 
rRectDst, const tools::Rectang
                     else
                     {
                         sal_uInt8 nTransparencyOpaque = 0;
-                        std::optional<AlphaMask> pAlpha(std::in_place, 
GetSizePixel(), &nTransparencyOpaque);
-
-                        maAlphaMask = pAlpha->ImplGetBitmap();
-                        pAlpha.reset();
+                        maAlphaMask = AlphaMask(GetSizePixel(), 
&nTransparencyOpaque);
                         maAlphaMask.CopyPixel( rRectDst, rRectSrc, 
&pBmpExSrc->maAlphaMask );
                     }
                 }
@@ -450,7 +447,7 @@ bool BitmapEx::CopyPixel( const tools::Rectangle& rRectDst, 
const tools::Rectang
                     sal_uInt8 nTransparencyOpaque = 0;
                     const AlphaMask aAlphaSrc(pBmpExSrc->GetSizePixel(), 
&nTransparencyOpaque);
 
-                    maAlphaMask.CopyPixel( rRectDst, rRectSrc, 
&aAlphaSrc.ImplGetBitmap() );
+                    maAlphaMask.CopyPixel( rRectDst, rRectSrc, &aAlphaSrc );
                 }
             }
         }