vcl/source/gdi/print.cxx | 10 ---------- 1 file changed, 10 deletions(-)
New commits: commit 2c47e504858b091468bcc04eadf90babe216e2f3 Author: Patrick Luby <[email protected]> AuthorDate: Mon Sep 1 11:32:41 2025 -0400 Commit: Xisco Fauli <[email protected]> CommitDate: Tue Dec 23 09:04:36 2025 +0100 Revert: draw alpha bitmaps directly to print graphics on macOS This partially reverts commit fa3dd1c3a190fcbead9d39038a30f0fd306a1baa. Apparently, the special handling of alpha bitmaps when printing on macOS is no longer needed and the alpha blending code used on other platforms now works as expected on macOS. Change-Id: Ib72e57ec679971c8db06160ae0354c8ba45be91e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190496 Tested-by: Jenkins Reviewed-by: Patrick Luby <[email protected]> Signed-off-by: Xisco Fauli <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196114 Reviewed-by: Dan Williams <[email protected]> diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index daebda8fb0d4..dec236fcc378 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -192,15 +192,6 @@ void Printer::DrawDeviceBitmapEx( const Point& rDestPt, const Size& rDestSize, const Point& rSrcPtPixel, const Size& rSrcSizePixel, BitmapEx& rBmpEx ) { -#ifdef MACOSX - // tdf#164354 draw alpha bitmaps directly to print graphics on macOS - // On macOS, there are no known problems drawing semi-transparent - // bitmaps so just draw the alpha bitmap directly without any blending. - AlphaMask aAlpha = rBmpEx.GetAlphaMask(); - aAlpha.Invert(); - DrawDeviceAlphaBitmap( rBmpEx.GetBitmap(), aAlpha, rDestPt, rDestSize, rSrcPtPixel, rSrcSizePixel ); - aAlpha.Invert(); -#else if( rBmpEx.IsAlpha() ) { // #107169# For true alpha bitmaps, no longer masking the @@ -215,7 +206,6 @@ void Printer::DrawDeviceBitmapEx( const Point& rDestPt, const Size& rDestSize, const Bitmap& aBmp( rBmpEx.GetBitmap() ); ImplPrintTransparent( aBmp, rDestPt, rDestSize, rSrcPtPixel, rSrcSizePixel ); } -#endif } void Printer::EmulateDrawTransparent ( const tools::PolyPolygon& rPolyPoly,
