[Libreoffice-commits] core.git: vcl/quartz

[Libreoffice Gerrit user]

 vcl/quartz/salvd.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 016746b9a9b85114560dead3ee226e4483a0d564
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Tue Dec 11 20:41:09 2018 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Tue Dec 11 20:41:09 2018 +0200

    Adapt MACOSX/IOS ifdef for the now constness of the nFlags variable
    
    Change-Id: Ic6c51cdc219e663c59dee32f61e337709c90fbd2

diff --git a/vcl/quartz/salvd.cxx b/vcl/quartz/salvd.cxx
index 96a64ae765b5..0fe4e7f923d3 100644
--- a/vcl/quartz/salvd.cxx
+++ b/vcl/quartz/salvd.cxx
@@ -276,9 +276,10 @@ bool AquaSalVirtualDevice::SetSize( long nDX, long nDY )
 
             const int nBytesPerRow = (mnBitmapDepth * nDX) / 8;
             void* pRawData = std::malloc( nBytesPerRow * nDY );
+#ifdef MACOSX
             const int nFlags = kCGImageAlphaNoneSkipFirst;
-#ifndef MACOSX
-            nFlags |= kCGImageByteOrder32Little;
+#else
+            const int nFlags = kCGImageAlphaNoneSkipFirst | kCGImageByteOrder32Little;
 #endif
             mxBitmapContext = CGBitmapContextCreate(pRawData, nDX, nDY, 8, nBytesPerRow,
                                                     GetSalData()->mxRGBSpace, nFlags);