Boost.Geometry fix, point_in_ring should get strategy, and included covered_by for multi (belongs to last fix)

[SVN r76977]
This commit is contained in:
Barend Gehrels
2012-02-11 14:52:43 +00:00
parent 3cac6cdad6
commit b86fa4fe8a
2 changed files with 3 additions and 2 deletions

View File

@@ -68,7 +68,7 @@ template <typename Point, typename Ring>
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 @@ struct covered_by<Point, Ring, point_tag, ring_tag>
order_as_direction<geometry::point_order<Ring>::value>::value,
geometry::closure<Ring>::value,
Strategy
>::apply(point, ring) >= 0;
>::apply(point, ring, strategy) >= 0;
}
};

View File

@@ -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>