[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - basegfx/source

[Caolán McNamara]

 basegfx/source/polygon/b2dpolygonclipper.cxx |    8 --------
 1 file changed, 8 deletions(-)

New commits:
commit df3c0f5a64068434e65786078065fd867b865d2b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jul 19 14:01:02 2016 +0100

    Resolves: tdf#100909 artifacts in hole of polypolygon shape
    
    regression from...
    
    commit 1ca06ce59b7d3cea873d2dc109a2acaec0a80759
    Date:   Tue Aug 5 16:11:21 2014 +0000
    
        Related: #i125349# moved clip enhancements to base clipping functionality
    
    The "reversed" clipPolyPolygonOnRange path is the problem apparently. The case
    in #i125349# uses the other clipPolyPolygonOnRange path. So for simplicity just
    remove the branch that's causing trouble here.
    
    Change-Id: Ia4c60ebc44a8c239c1a7d5c84e9b970c2885ff05
    (cherry picked from commit d074b2728afa0b902c75ca0ebaae209454e6d922)
    Reviewed-on: https://gerrit.libreoffice.org/27319
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/basegfx/source/polygon/b2dpolygonclipper.cxx b/basegfx/source/polygon/b2dpolygonclipper.cxx
index 7b49169..360263a 100644
--- a/basegfx/source/polygon/b2dpolygonclipper.cxx
+++ b/basegfx/source/polygon/b2dpolygonclipper.cxx
@@ -426,14 +426,6 @@ namespace basegfx
                                 // both are ranges
                                 bBothRectangle = true;
                             }
-                            else
-                            {
-                                // rCandidate is rectangle -> clip rClip on rRectangle, use the much
-                                // cheaper and numerically more stable clipping against a range
-                                // This simplification (exchanging content and clip) is valid
-                                // since we do a logical AND operation
-                                return clipPolyPolygonOnRange(rClip, rCandidate.getB2DRange(), bInside, bStroke);
-                            }
                         }
                         else if(basegfx::tools::isRectangle(rClip))
                         {