Subject: [Boost-commit] svn:boost r76460 - trunk/boost/geometry/extensions/algorithms/buffer
From: barend.gehrels_at_[hidden]
Date: 2012-01-13 12:19:56
Author: barendgehrels
Date: 2012-01-13 12:19:55 EST (Fri, 13 Jan 2012)
New Revision: 76460
URL: http://svn.boost.org/trac/boost/changeset/76460
Log:
Fixes in extension buffer
Text files modified:
trunk/boost/geometry/extensions/algorithms/buffer/polygon_buffer.hpp | 7 ++++---
trunk/boost/geometry/extensions/algorithms/buffer/segmenting_buffer.hpp | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
Modified: trunk/boost/geometry/extensions/algorithms/buffer/polygon_buffer.hpp
==============================================================================
--- trunk/boost/geometry/extensions/algorithms/buffer/polygon_buffer.hpp (original)
+++ trunk/boost/geometry/extensions/algorithms/buffer/polygon_buffer.hpp 2012-01-13 12:19:55 EST (Fri, 13 Jan 2012)
@@ -17,6 +17,7 @@
#include <boost/typeof/typeof.hpp>
#include <boost/geometry/core/point_type.hpp>
+#include <boost/geometry/core/interior_rings.hpp>
#include <boost/geometry/extensions/strategies/buffer_side.hpp>
#include <boost/geometry/extensions/algorithms/buffer/line_line_intersection.hpp>
@@ -50,7 +51,7 @@
#endif
)
{
- typedef segment<output_point_type const> segment_type;
+ typedef model::referring_segment<output_point_type const> segment_type;
typedef typename boost::range_iterator
<
RingInput const
@@ -205,9 +206,9 @@
#endif
);
- typename interior_return_type<Polygon const>::type rings
+ typename interior_return_type<PolygonInput const>::type rings
= interior_rings(polygon);
- for (BOOST_AUTO_TPL(it, boost::begin(rings); it != boost::end(rings); ++it)
+ for (BOOST_AUTO_TPL(it, boost::begin(rings)); it != boost::end(rings); ++it)
{
output_ring_type ring;
policy::apply(*it, ring, distance, join_strategy
Modified: trunk/boost/geometry/extensions/algorithms/buffer/segmenting_buffer.hpp
==============================================================================
--- trunk/boost/geometry/extensions/algorithms/buffer/segmenting_buffer.hpp (original)
+++ trunk/boost/geometry/extensions/algorithms/buffer/segmenting_buffer.hpp 2012-01-13 12:19:55 EST (Fri, 13 Jan 2012)
@@ -92,7 +92,7 @@
typedef typename point_type<GeometryOut>::type point_type;
typedef typename coordinate_type<point_type>::type coordinate_type;
typedef coordinate_type distance_type; // TODO promote to FP
- typedef segment<point_type const> segment_type;
+ typedef model::segment<point_type const> segment_type;
typedef typename geometry::ring_type<GeometryOut>::type ring_type;
typedef typename strategy::side::services::default_strategy<typename cs_tag<point_type>::type>::type side;