[Boost-commit] svn:boost r76977 - in trunk/boost/geometry: algorithms multi/algorithms

Subject: [Boost-commit] svn:boost r76977 - in trunk/boost/geometry: algorithms multi/algorithms
From: barend.gehrels_at_[hidden]
Date: 2012-02-11 09:52:44

Author: barendgehrels
Date: 2012-02-11 09:52:43 EST (Sat, 11 Feb 2012)
New Revision: 76977
URL: http://svn.boost.org/trac/boost/changeset/76977

Log:
Boost.Geometry fix, point_in_ring should get strategy, and included covered_by for multi (belongs to last fix)
Text files modified: 
   trunk/boost/geometry/algorithms/covered_by.hpp         |     4 ++--                                    
   trunk/boost/geometry/multi/algorithms/intersection.hpp |     1 +                                       
   2 files changed, 3 insertions(+), 2 deletions(-)

Modified: trunk/boost/geometry/algorithms/covered_by.hpp
==============================================================================
--- trunk/boost/geometry/algorithms/covered_by.hpp	(original)
+++ trunk/boost/geometry/algorithms/covered_by.hpp	2012-02-11 09:52:43 EST (Sat, 11 Feb 2012)
@@ -68,7 +68,7 @@
 struct covered_by<Point, Ring, point_tag, ring_tag>
 {
     template <typename Strategy>
-    static inline bool apply(Point const& point, Ring const& ring, Strategy const& )
+    static inline bool apply(Point const& point, Ring const& ring, Strategy const& strategy)
     {
         return detail::within::point_in_ring
             <
@@ -77,7 +77,7 @@
                 order_as_direction<geometry::point_order<Ring>::value>::value,
                 geometry::closure<Ring>::value,
                 Strategy
-            >::apply(point, ring) >= 0;
+            >::apply(point, ring, strategy) >= 0;
     }
 };
 

Modified: trunk/boost/geometry/multi/algorithms/intersection.hpp
==============================================================================
--- trunk/boost/geometry/multi/algorithms/intersection.hpp	(original)
+++ trunk/boost/geometry/multi/algorithms/intersection.hpp	2012-02-11 09:52:43 EST (Sat, 11 Feb 2012)
@@ -14,6 +14,7 @@
 #include <boost/geometry/multi/core/geometry_id.hpp>
 #include <boost/geometry/multi/core/is_areal.hpp>
 #include <boost/geometry/multi/core/point_order.hpp>
+#include <boost/geometry/multi/algorithms/covered_by.hpp>
 #include <boost/geometry/multi/algorithms/envelope.hpp>
 #include <boost/geometry/multi/algorithms/num_points.hpp>
 #include <boost/geometry/multi/algorithms/detail/overlay/get_ring.hpp>