vcl/backendtest/outputdevice/polyline_b2d.cxx | 4 ++-- vcl/osx/salinst.cxx | 3 +-- vcl/skia/osx/bitmap.cxx | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-)
New commits: commit 7d77474c3bc48c326885ff390c9ae2884b8504fc Author: Noel Grandin <[email protected]> AuthorDate: Fri Sep 5 10:04:09 2025 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Fri Sep 5 12:32:07 2025 +0200 BitmapEx->Bitmap in a couple of places where we can just call something on the underlying Bitmap Change-Id: Ieaeb72ca5d0a7a9e35c94daa86ba38bda992a164 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190611 Reviewed-by: Noel Grandin <[email protected]> Tested-by: Jenkins diff --git a/vcl/backendtest/outputdevice/polyline_b2d.cxx b/vcl/backendtest/outputdevice/polyline_b2d.cxx index 9117b792cf8d..cfe6daefc3ae 100644 --- a/vcl/backendtest/outputdevice/polyline_b2d.cxx +++ b/vcl/backendtest/outputdevice/polyline_b2d.cxx @@ -52,8 +52,8 @@ Bitmap OutputDeviceTestPolyLineB2D::setupRectangle(bool bEnableAA) drawPolyLineOffset(*mpVirtualDevice, maVDRectangle, 2); drawPolyLineOffset(*mpVirtualDevice, maVDRectangle, 5); - return BitmapEx(mpVirtualDevice->GetBitmap(maVDRectangle.TopLeft(), maVDRectangle.GetSize())) - .GetBitmap(); + return mpVirtualDevice->GetBitmap(maVDRectangle.TopLeft(), maVDRectangle.GetSize()) + .CreateColorBitmap(); } Bitmap OutputDeviceTestPolyLineB2D::setupDiamond() diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx index 1d4c6dcba453..3110d0c84701 100644 --- a/vcl/osx/salinst.cxx +++ b/vcl/osx/salinst.cxx @@ -1050,8 +1050,7 @@ CGImageRef CreateCGImage( const Image& rImage ) xImage = pSalBmp->CreateCroppedImage( 0, 0, pSalBmp->mnWidth, pSalBmp->mnHeight ); else { - BitmapEx aBmpEx(aBmp); - AlphaMask aAlphaMask( aBmpEx.GetAlphaMask() ); + AlphaMask aAlphaMask( aBmp.CreateAlphaMask() ); Bitmap aMask( aAlphaMask.GetBitmap() ); QuartzSalBitmap* pMaskBmp = static_cast<QuartzSalBitmap*>(aMask.ImplGetSalBitmap().get()); if( pMaskBmp ) diff --git a/vcl/skia/osx/bitmap.cxx b/vcl/skia/osx/bitmap.cxx index 1cb171485ace..eda213d58bdd 100644 --- a/vcl/skia/osx/bitmap.cxx +++ b/vcl/skia/osx/bitmap.cxx @@ -61,8 +61,7 @@ CGImageRef createCGImage(const Image& rImage) } else { - BitmapEx bitmapEx(bitmap); - AlphaMask alpha(bitmapEx.GetAlphaMask()); + AlphaMask alpha(bitmap.CreateAlphaMask()); // tdf#156854 invert alpha mask for macOS native menu item images // At the time of this change, only the AquaSalMenu class calls this // function so it should be safe to invert the alpha mask here.
