[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - vcl/quartz
Tor Lillqvist (via logerrit)
logerrit at kemper.freedesktop.org
Tue Jul 21 12:19:03 UTC 2020
vcl/quartz/salgdiutils.cxx | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
New commits:
commit 17893434455b286aae03d570ef3272c7b3a13c91
Author: Tor Lillqvist <tml at collabora.com>
AuthorDate: Mon Jul 20 14:43:33 2020 +0300
Commit: Tor Lillqvist <tml at collabora.com>
CommitDate: Tue Jul 21 14:18:27 2020 +0200
This file is used for macOS only
Change-Id: I9500453c8964b774e4b0be41a7b2f1a8c28040b2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99138
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Tor Lillqvist <tml at collabora.com>
diff --git a/vcl/quartz/salgdiutils.cxx b/vcl/quartz/salgdiutils.cxx
index 589bd2ae22e5..426aea29dc78 100644
--- a/vcl/quartz/salgdiutils.cxx
+++ b/vcl/quartz/salgdiutils.cxx
@@ -134,11 +134,7 @@ bool AquaSalGraphics::CheckContext()
const int nBytesPerRow = (nBitmapDepth * nScaledWidth) / 8;
void* pRawData = std::malloc(nBytesPerRow * nScaledHeight);
-#ifdef MACOSX
- const int nFlags = kCGImageAlphaNoneSkipFirst;
-#else
- const int nFlags = kCGImageAlphaNoneSkipFirst | kCGImageByteOrder32Little;
-#endif
+ const int nFlags = kCGImageAlphaNoneSkipFirst;
CGContextHolder aContextHolder(CGBitmapContextCreate(
pRawData, nScaledWidth, nScaledHeight, 8, nBytesPerRow, GetSalData()->mxRGBSpace, nFlags));
More information about the Libreoffice-commits
mailing list