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

[tsahi glik]

 vcl/quartz/salgdicommon.cxx |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

New commits:
commit bbff44e5aac6cb98582ecbab8bb478c54eaefcbf
Author: tsahi glik <tsahi.g...@cloudon.com>
Date:   Fri Jan 10 10:26:07 2014 -0800

    Normalized aqua graphics line and fill colors to RGBA

diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx
index cc45334..c2b1c8e 100644
--- a/vcl/quartz/salgdicommon.cxx
+++ b/vcl/quartz/salgdicommon.cxx
@@ -1452,7 +1452,8 @@ void AquaSalGraphics::SetLineColor()
     maLineColor.SetAlpha( 0.0 );   // transparent
     if( CheckContext() )
     {
-        CGContextSetStrokeColor( mrContext, maLineColor.AsArray() );
+        CGContextSetRGBStrokeColor( mrContext, maLineColor.GetRed(), 
maLineColor.GetGreen(),
+                                    maLineColor.GetBlue(), 
maLineColor.GetAlpha() );
     }
 }
 
@@ -1461,7 +1462,8 @@ void AquaSalGraphics::SetLineColor( SalColor nSalColor )
     maLineColor = RGBAColor( nSalColor );
     if( CheckContext() )
     {
-        CGContextSetStrokeColor( mrContext, maLineColor.AsArray() );
+        CGContextSetRGBStrokeColor( mrContext, maLineColor.GetRed(), 
maLineColor.GetGreen(),
+                                   maLineColor.GetBlue(), 
maLineColor.GetAlpha() );
     }
 }
 
@@ -1470,7 +1472,8 @@ void AquaSalGraphics::SetFillColor()
     maFillColor.SetAlpha( 0.0 );   // transparent
     if( CheckContext() )
     {
-        CGContextSetFillColor( mrContext, maFillColor.AsArray() );
+        CGContextSetRGBFillColor( mrContext, maFillColor.GetRed(), 
maFillColor.GetGreen(),
+                                  maFillColor.GetBlue(), 
maFillColor.GetAlpha() );
     }
 }
 
@@ -1479,7 +1482,8 @@ void AquaSalGraphics::SetFillColor( SalColor nSalColor )
     maFillColor = RGBAColor( nSalColor );
     if( CheckContext() )
     {
-        CGContextSetFillColor( mrContext, maFillColor.AsArray() );
+        CGContextSetRGBFillColor( mrContext, maFillColor.GetRed(), 
maFillColor.GetGreen(),
+                                 maFillColor.GetBlue(), maFillColor.GetAlpha() 
);
     }
 }
 
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits