diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2022-02-04 15:01:26 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2022-02-04 19:13:21 +0100 |
| commit | 0be8060a856f86fdfb42372e58073586b29c93fa (patch) | |
| tree | 3250eb66ab5d1cce698ec47fc985081fad0c0483 /vcl | |
| parent | c7923851d10e2dda9deb414dee67c4813d93bc87 (diff) | |
Revert "lok: copy over the alpha channel too for cairo..."
Not needed in the end.
This reverts commit 688051edf59a311371b84ea34db4991d3a164d52.
Change-Id: If2474ccff0ada5fd0ca5206f10ca2893df0fe1f8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129491
Tested-by: Jenkins
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'vcl')
| -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, |