[Libreoffice-commits] .: Branch 'libreoffice-3-4' - canvas/source

[Petr Mladek]

 canvas/source/cairo/cairo_canvashelper.cxx |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

New commits:
commit f143e7cf1ceaf7526fc95ca70ad95b4458d52225
Author: Radek Doulik <rodo at novell.com>
Date:   Tue Jul 12 13:35:43 2011 +0200

    fix set color regression in cairo canvas
    
     - the cairo_set_source_rgba should be called with non-alpha-pre-multiplied
       color values
     - fixes fdo#33591 and fdo#35681
    
    Signed-off-by: Petr Mladek <pmladek at suse.cz>

diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx
index 18e23f3..ccf7dd9 100644
--- a/canvas/source/cairo/cairo_canvashelper.cxx
+++ b/canvas/source/cairo/cairo_canvashelper.cxx
@@ -128,13 +128,11 @@ namespace cairocanvas
     {
         if( rColor.getLength() > 3 )
         {
-            const double alpha = rColor[3];
-
             cairo_set_source_rgba( pCairo,
-                                   alpha*rColor[0],
-                                   alpha*rColor[1],
-                                   alpha*rColor[2],
-                                   alpha );
+                                   rColor[0],
+                                   rColor[1],
+                                   rColor[2],
+                                   rColor[3] );
         }
         else if( rColor.getLength() == 3 )
             cairo_set_source_rgb( pCairo,