vcl/quartz/salbmp.cxx | 28 +++++++++++++++++++++++++++-
1 file changed, 27 insertions(+), 1 deletion(-)
New commits:
commit aa5c3d32d7c85b496fa86d8198478fb6dc157811
Author: Patrick Luby <plub...@neooffice.org>
AuthorDate: Wed Jul 5 15:51:32 2023 -0400
Commit: Patrick Luby <plub...@neooffice.org>
CommitDate: Thu Jul 6 00:46:54 2023 +0200
Fix failure to generate the correct color mask
OutputDevice::ImplDrawRotateText() draws black text but
that will generate gray pixels due to antialiasing so
count dark gray the same as black, light gray the same
as white, and the rest as medium gray.
The results are not smooth since LibreOffice appears to
redraw these semi-transparent masks repeatedly without
clearing the background so the semi-transparent pixels
will grow darker with repeatedly redraws due to
cumulative blending. But it is now better than before.
Change-Id: If64ff5ab52a6e441b587aa3c3c12b08137ecf34e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154079
Tested-by: Jenkins
Reviewed-by: Patrick Luby <plub...@neooffice.org>
diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx
index afd65d863370..ab435c0acdfc 100644
--- a/vcl/quartz/salbmp.cxx
+++ b/vcl/quartz/salbmp.cxx
@@ -560,7 +560,33 @@ CGImageRef QuartzSalBitmap::CreateColorMask( int nX, int
nY, int nWidth,
sal_uInt32 x = nWidth;
while( x-- )
{
- *pDest++ = (pSourcePixels->readPixel() == 0) ? nColor : 0;
+ // Fix failure to generate the correct color mask
+ // OutputDevice::ImplDrawRotateText() draws black text but
+ // that will generate gray pixels due to antialiasing so
+ // count dark gray the same as black, light gray the same
+ // as white, and the rest as medium gray.
+ // The results are not smooth since LibreOffice appears to
+ // redraw these semi-transparent masks repeatedly without
+ // clearing the background so the semi-transparent pixels
+ // will grow darker with repeatedly redraws due to
+ // cumulative blending. But it is now better than before.
+ sal_uInt8 nAlpha = 255 -
pSourcePixels->readPixel().GetRed();
+ sal_uInt32 nPremultColor = nColor;
+ if ( nAlpha < 192 )
+ {
+ if ( nAlpha < 64 )
+ {
+ nPremultColor = 0;
+ }
+ else
+ {
+ reinterpret_cast<sal_uInt8*>(&nPremultColor)[0] /=
2;
+ reinterpret_cast<sal_uInt8*>(&nPremultColor)[1] /=
2;
+ reinterpret_cast<sal_uInt8*>(&nPremultColor)[2] /=
2;
+ reinterpret_cast<sal_uInt8*>(&nPremultColor)[3] /=
2;
+ }
+ }
+ *pDest++ = nPremultColor;
}
pSource += mnBytesPerRow;
}
