canvas/source/cairo/cairo_canvashelper.cxx | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
New commits: commit b65b4160bfae737d3bc435f23d551bef65e02f81 Author: Radek Doulik <[email protected]> Date: Mon Aug 20 12:54:37 2012 +0200 fill whole polypolygon at once, so that fill rule is applied correctly - fixes rest of n#759172 Change-Id: I6c2694bf8276337b7d1fa54a12867bfc2b658a23 diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx index 924e6f8..a7cf165 100644 --- a/canvas/source/cairo/cairo_canvashelper.cxx +++ b/canvas/source/cairo/cairo_canvashelper.cxx @@ -1045,12 +1045,6 @@ namespace cairocanvas if( aPolygon.isClosed() ) cairo_close_path( pCairo ); - if( aOperation == Fill && pTextures ) - { - cairo_set_matrix( pCairo, &aOrigMatrix ); - doOperation( aOperation, pCairo, pTextures, pDevice, aPolyPolygon.getB2DRange() ); - cairo_set_matrix( pCairo, &aIdentityMatrix ); - } } else { @@ -1063,6 +1057,14 @@ namespace cairocanvas } } } + + if( aOperation == Fill && pTextures ) + { + cairo_set_matrix( pCairo, &aOrigMatrix ); + doOperation( aOperation, pCairo, pTextures, pDevice, aPolyPolygon.getB2DRange() ); + cairo_set_matrix( pCairo, &aIdentityMatrix ); + } + if( bOpToDo && ( aOperation != Fill || !pTextures ) ) doOperation( aOperation, pCairo, pTextures, pDevice, aPolyPolygon.getB2DRange() ); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
