diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2022-02-04 14:54:49 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2022-02-21 22:00:27 +0100 |
| commit | 50ee0a80c43d64ed5f9634a2d4ea6ab1a55a291d (patch) | |
| tree | 480cfb800fd1cd5120443facb7fde0c79a834057 /vcl/source/bitmap | |
| parent | 6554977f29fd7043aa00fdd775494f050514a048 (diff) | |
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 <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'vcl/source/bitmap')
| -rw-r--r-- | vcl/source/bitmap/BitmapReadAccess.cxx | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/vcl/source/bitmap/BitmapReadAccess.cxx b/vcl/source/bitmap/BitmapReadAccess.cxx index 08c148a4d3fe..6e87debd1ec1 100644 --- a/vcl/source/bitmap/BitmapReadAccess.cxx +++ b/vcl/source/bitmap/BitmapReadAccess.cxx @@ -19,7 +19,6 @@ #include <vcl/BitmapReadAccess.hxx> #include <vcl/BitmapTools.hxx> -#include <comphelper/lok.hxx> #include <salbmp.hxx> #include <svdata.hxx> @@ -458,8 +457,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; } @@ -483,7 +480,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, |