vcl/source/gdi/bmpacc2.cxx | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
New commits: commit f608ca3a3d2b0fc8bb37d2282117e4289a5f076d Author: Luboš Luňák <[email protected]> AuthorDate: Fri Feb 4 14:54:49 2022 +0100 Commit: Michael Meeks <[email protected]> CommitDate: Fri Feb 4 19:13:35 2022 +0100 Revert "lok: copy over the alpha channel too for cairo..." Not needed anymore (T33230) and no need to slow the function down by checking for LOK. This reverts commit a9c473c3306e28462f9a1898a94277cf0adcbe5e. Change-Id: I585ded78c8617c2560c44ec027d76b363bd26c1c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129490 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Michael Meeks <[email protected]> diff --git a/vcl/source/gdi/bmpacc2.cxx b/vcl/source/gdi/bmpacc2.cxx index 64dadadd5f8f..88f0c7f7482b 100644 --- a/vcl/source/gdi/bmpacc2.cxx +++ b/vcl/source/gdi/bmpacc2.cxx @@ -19,7 +19,6 @@ #include <vcl/bitmapaccess.hxx> #include <vcl/BitmapTools.hxx> -#include <comphelper/lok.hxx> BitmapColor BitmapReadAccess::GetPixelForN1BitMsbPal(ConstScanline pScanline, tools::Long nX, const ColorMask&) { @@ -263,8 +262,6 @@ BitmapColor BitmapReadAccess::GetPixelForN32BitTcBgrx(ConstScanline pScanline, t aBitmapColor.SetBlue( *pScanline++ ); aBitmapColor.SetGreen( *pScanline++ ); aBitmapColor.SetRed( *pScanline ); - if (comphelper::LibreOfficeKit::isActive()) - aBitmapColor.SetAlpha(0xFF - *(++pScanline)); return aBitmapColor; } @@ -286,7 +283,7 @@ void BitmapReadAccess::SetPixelForN32BitTcBgrx(Scanline pScanline, tools::Long n *pScanline++ = rBitmapColor.GetBlue(); *pScanline++ = rBitmapColor.GetGreen(); *pScanline++ = rBitmapColor.GetRed(); - *pScanline = (comphelper::LibreOfficeKit::isActive()) ? 0xFF - rBitmapColor.GetAlpha() : 0xFF; + *pScanline = 0xFF; } BitmapColor BitmapReadAccess::GetPixelForN32BitTcRgba(ConstScanline pScanline, tools::Long nX, const ColorMask&)
