[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/coretext

[Tor Lillqvist]

 vcl/coretext/ctfonts.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 5fd52a60cad1be6ffa08d6508526539d7def0e03
Author: Tor Lillqvist <tml at iki.fi>
Date:   Wed Jun 5 23:11:35 2013 +0300

    CGColorCreateGenericRGB is not available on iOS
    
    Change-Id: Id7c6077ea0e45d848be099d48ef4d7207e65a06f
    (cherry picked from commit f2e5461f5615650745f6a846be461d97f6caf2b5)
    Reviewed-on: https://gerrit.libreoffice.org/4381
    Reviewed-by: Noel Power <noel.power at suse.com>
    Tested-by: Noel Power <noel.power at suse.com>

diff --git a/vcl/coretext/ctfonts.cxx b/vcl/coretext/ctfonts.cxx
index 435b141..8d693d1 100644
--- a/vcl/coretext/ctfonts.cxx
+++ b/vcl/coretext/ctfonts.cxx
@@ -232,8 +232,10 @@ bool CTTextStyle::GetGlyphOutline( sal_GlyphId nGlyphId, basegfx::B2DPolyPolygon
 
 void CTTextStyle::SetTextColor( const RGBAColor& rColor )
 {
-    CGColorRef pCGColor = CGColorCreateGenericRGB( rColor.GetRed(),
-        rColor.GetGreen(), rColor.GetBlue(), rColor.GetAlpha() );
+    CGFloat aColor[] = { rColor.GetRed(), rColor.GetGreen(), rColor.GetBlue(), rColor.GetAlpha() };
+    CGColorSpaceRef cs = CGColorSpaceCreateDeviceRGB();
+    CGColorRef pCGColor = CGColorCreate( cs, aColor );
+    CGColorSpaceRelease( cs );
     CFDictionarySetValue( mpStyleDict, kCTForegroundColorAttributeName, pCGColor );
     CFRelease( pCGColor);
 }