From 26131fb7086f07f08931c071d4938edbd9199907 Mon Sep 17 00:00:00 2001
From: Blake Thompson <flippmoke@gmail.com>
Date: Wed, 15 Apr 2015 00:35:31 -0500
Subject: [PATCH] Updated clipper

---
 deps/clipper/include/clipper.hpp | 16 ++++++++--------
 deps/clipper/src/clipper.cpp     |  9 +++------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/deps/clipper/include/clipper.hpp b/deps/clipper/include/clipper.hpp
index fa3011306..c1cb4a15f 100755
--- a/deps/clipper/include/clipper.hpp
+++ b/deps/clipper/include/clipper.hpp
@@ -1,8 +1,8 @@
 /*******************************************************************************
 *                                                                              *
 * Author    :  Angus Johnson                                                   *
-* Version   :  6.2.8                                                           *
-* Date      :  10 February 2015                                                *
+* Version   :  6.2.9                                                           *
+* Date      :  16 February 2015                                                *
 * Website   :  http://www.angusj.com                                           *
 * Copyright :  Angus Johnson 2010-2015                                         *
 *                                                                              *
@@ -170,13 +170,13 @@ private:
     friend class MAPNIK_DECL Clipper; //to access AllNodes
 };
 
-bool Orientation(const Path &poly);
-double Area(const Path &poly);
-int PointInPolygon(const IntPoint &pt, const Path &path);
+MAPNIK_DECL bool Orientation(const Path &poly);
+MAPNIK_DECL double Area(const Path &poly);
+MAPNIK_DECL int PointInPolygon(const IntPoint &pt, const Path &path);
 
-void SimplifyPolygon(const Path &in_poly, Paths &out_polys, PolyFillType fillType = pftEvenOdd);
-void SimplifyPolygons(const Paths &in_polys, Paths &out_polys, PolyFillType fillType = pftEvenOdd);
-void SimplifyPolygons(Paths &polys, PolyFillType fillType = pftEvenOdd);
+MAPNIK_DECL void SimplifyPolygon(const Path &in_poly, Paths &out_polys, PolyFillType fillType = pftEvenOdd);
+MAPNIK_DECL void SimplifyPolygons(const Paths &in_polys, Paths &out_polys, PolyFillType fillType = pftEvenOdd);
+MAPNIK_DECL void SimplifyPolygons(Paths &polys, PolyFillType fillType = pftEvenOdd);
 
 MAPNIK_DECL void CleanPolygon(const Path& in_poly, Path& out_poly, double distance = 1.415);
 MAPNIK_DECL void CleanPolygon(Path& poly, double distance = 1.415);
diff --git a/deps/clipper/src/clipper.cpp b/deps/clipper/src/clipper.cpp
index 2e63bc7af..bc53d9159 100755
--- a/deps/clipper/src/clipper.cpp
+++ b/deps/clipper/src/clipper.cpp
@@ -1,8 +1,8 @@
 /*******************************************************************************
 *                                                                              *
 * Author    :  Angus Johnson                                                   *
-* Version   :  6.2.8                                                           *
-* Date      :  10 February 2015                                                *
+* Version   :  6.2.9                                                           *
+* Date      :  16 February 2015                                                *
 * Website   :  http://www.angusj.com                                           *
 * Copyright :  Angus Johnson 2010-2015                                         *
 *                                                                              *
@@ -969,16 +969,13 @@ TEdge* ClipperBase::ProcessBound(TEdge* E, bool NextIsForward)
       EStart = E->Prev;
     else 
       EStart = E->Next;
-    if (EStart->OutIdx != Skip)
-    {
-      if (IsHorizontal(*EStart)) //ie an adjoining horizontal skip edge
+    if (IsHorizontal(*EStart)) //ie an adjoining horizontal skip edge
       {
         if (EStart->Bot.X != E->Bot.X && EStart->Top.X != E->Bot.X)
           ReverseHorizontal(*E);
       }
       else if (EStart->Bot.X != E->Bot.X)
         ReverseHorizontal(*E);
-    }
   }
   
   EStart = E;