[mapnik-vector-tile] 04/06: Update clipper to 381c817fd13e819e90006ed1f3c26ea6f1e6e343.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository mapnik-vector-tile.

commit b7f2612a852bdb493950bdefac0a52ebac5fb8e9
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Apr 16 18:55:37 2016 +0200

    Update clipper to 381c817fd13e819e90006ed1f3c26ea6f1e6e343.
---
 debian/changelog   |  1 +
 debian/clipper.cpp | 22 ++++++++++++++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a15915e..49936ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 mapnik-vector-tile (1.1.1+dfsg-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Update clipper to 381c817fd13e819e90006ed1f3c26ea6f1e6e343.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 16 Apr 2016 18:53:54 +0200
 
diff --git a/debian/clipper.cpp b/debian/clipper.cpp
index 3c1f3f0..2cd7102 100644
--- a/debian/clipper.cpp
+++ b/debian/clipper.cpp
@@ -3986,11 +3986,27 @@ void Clipper::FixupFirstLefts2(OutRec* InnerOutRec, OutRec* OuterOutRec)
     {
         if (outRec->IsHole == OuterOutRec->IsHole)
         {
-            outRec->FirstLeft = ParseFirstLeft(OuterOutRec->FirstLeft);
+            if (Poly2ContainsPoly1(outRec->Pts, OuterOutRec->Pts))
+            {
+                outRec->FirstLeft = OuterOutRec;
+            }
+            else
+            {
+                outRec->FirstLeft = ParseFirstLeft(OuterOutRec->FirstLeft);
+            }
         }
         else
         {
-            outRec->FirstLeft = OuterOutRec;
+            if (Area(outRec->Pts) == 0.0 && !Poly2ContainsPoly1(outRec->Pts, OuterOutRec->Pts))
+            {
+                outRec->IsHole = !outRec->IsHole;
+                outRec->FirstLeft = ParseFirstLeft(OuterOutRec->FirstLeft);
+                ReversePolyPtLinks(outRec->Pts);
+            }
+            else
+            {
+                outRec->FirstLeft = OuterOutRec;
+            }
         }
     }
   }
@@ -5215,6 +5231,8 @@ void Clipper::DoSimplePolygons()
                                     dupeRec.emplace(outrec2->Idx, intPt2);
                                 }
                             }
+                            outRec_j = GetOutRec(m_OutPts[j]->Idx);
+                            idx_j = outRec_j->Idx;
                         }
                         continue;
                     }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapnik-vector-tile.git