[mapnik-vector-tile] 06/06: Update clipper to b82601d67830a84179888360e3dea645c1125a26.

[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 389c523efac4a176c53c63acfe2b4f5a6dc72c88
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Mar 5 02:56:00 2016 +0100

    Update clipper to b82601d67830a84179888360e3dea645c1125a26.
---
 debian/changelog   | 1 +
 debian/clipper.cpp | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 272c0f8..baa80a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ mapnik-vector-tile (1.0.3+dfsg-1) UNRELEASED; urgency=medium
   * Refresh patches.
   * Bump protozero dependency to 1.3.0.
   * Bump Standards-Version to 3.9.7, no changes.
+  * Update clipper to b82601d67830a84179888360e3dea645c1125a26.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 05 Mar 2016 02:53:40 +0100
 
diff --git a/debian/clipper.cpp b/debian/clipper.cpp
index dece0ce..3772e1e 100644
--- a/debian/clipper.cpp
+++ b/debian/clipper.cpp
@@ -3643,7 +3643,7 @@ void Clipper::FixupFirstLefts2(OutRec* InnerOutRec, OutRec* OuterOutRec)
   //It's possible that these polygons now wrap around other polygons, so check
   //every polygon that's also contained by OuterOutRec's FirstLeft container
   //(including 0) to see if they've become inner to the new inner polygon ...
-  OutRec* orfl = OuterOutRec->FirstLeft;
+  OutRec* orfl = ParseFirstLeft(OuterOutRec->FirstLeft);
   for (PolyOutList::size_type i = 0; i < m_PolyOuts.size(); ++i)
   {
     OutRec* outRec = m_PolyOuts[i];
@@ -3657,7 +3657,7 @@ void Clipper::FixupFirstLefts2(OutRec* InnerOutRec, OutRec* OuterOutRec)
       outRec->FirstLeft = InnerOutRec;
     else if (Poly2ContainsPoly1(outRec->Pts, OuterOutRec->Pts))
       outRec->FirstLeft = OuterOutRec;
-    else if (outRec->FirstLeft == InnerOutRec || outRec->FirstLeft == OuterOutRec)
+    else if (firstLeft == InnerOutRec || firstLeft == OuterOutRec)
       outRec->FirstLeft = orfl;
   }
 }

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