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

Tor Lillqvist tml at collabora.com
Tue Apr 1 01:19:27 PDT 2014


 vcl/quartz/salbmp.cxx |    8 --------
 1 file changed, 8 deletions(-)

New commits:
commit 994da4b9738dafdc0654a439a40adfe4c02a507d
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Apr 1 11:18:16 2014 +0300

    Simplify
    
    Change-Id: I9857afc5dd6652fc28be00bea81ad213712b3dc5

diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx
index 8003356..e0a57d3 100644
--- a/vcl/quartz/salbmp.cxx
+++ b/vcl/quartz/salbmp.cxx
@@ -207,11 +207,7 @@ bool QuartzSalBitmap::CreateContext()
         AllocateUserData();
 
     // default to RGBA color space
-#ifdef IOS
-    CGColorSpaceRef aCGColorSpace = CGColorSpaceCreateDeviceRGB();
-#else
     CGColorSpaceRef aCGColorSpace = GetSalData()->mxRGBSpace;
-#endif
     CGBitmapInfo aCGBmpInfo = kCGImageAlphaNoneSkipFirst;
 
     // convert data into something accepted by CGBitmapContextCreate()
@@ -226,11 +222,7 @@ bool QuartzSalBitmap::CreateContext()
     {
         // no conversion needed for grayscale
         maContextBuffer = maUserBuffer;
-#ifdef IOS
-        aCGColorSpace = CGColorSpaceCreateDeviceGray();
-#else
         aCGColorSpace = GetSalData()->mxGraySpace;
-#endif
         aCGBmpInfo = kCGImageAlphaNone;
         bitsPerComponent = mnBits;
     }


More information about the Libreoffice-commits mailing list