[Libreoffice-commits] .: canvas/source

[Radek Doulík]

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

New commits:
commit f0a5e147eb9ae4a343f51eda20126488347e66f8
Author: Radek Doulik <rodo at novell.com>
Date:   Thu Apr 12 10:07:03 2012 +0200

    add .5 to control points coordinates after transformation
    
     - otherwise we might end up with wrong coordinates
     - fixes fdo#38580

diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx
index c04ac93..b75efda 100644
--- a/canvas/source/cairo/cairo_canvashelper.cxx
+++ b/canvas/source/cairo/cairo_canvashelper.cxx
@@ -1024,6 +1024,9 @@ namespace cairocanvas
                             nBX = aB.getX();
                             nBY = aB.getY();
 
+                            cairo_matrix_transform_point( &aOrigMatrix, &nAX, &nAY );
+                            cairo_matrix_transform_point( &aOrigMatrix, &nBX, &nBY );
+
                             if( aOperation == Stroke )
                             {
                                 nAX += 0.5;
@@ -1031,8 +1034,7 @@ namespace cairocanvas
                                 nBX += 0.5;
                                 nBY += 0.5;
                             }
-                            cairo_matrix_transform_point( &aOrigMatrix, &nAX, &nAY );
-                            cairo_matrix_transform_point( &aOrigMatrix, &nBX, &nBY );
+
                             cairo_curve_to( pCairo, nAX, nAY, nBX, nBY, nX, nY );
                         }
                         else