Subject: [Boost-commit] svn:boost r85360 - trunk/boost/geometry/extensions/algorithms
From: barend.gehrels_at_[hidden]
Date: 2013-08-15 17:04:00
Author: barendgehrels
Date: 2013-08-15 17:03:59 EDT (Thu, 15 Aug 2013)
New Revision: 85360
URL: http://svn.boost.org/trac/boost/changeset/85360
Log:
[geometry] fixed dissolve-extension, which was broken for quite some time, however it was only missing an extra parameter in assign_parents
Text files modified:
trunk/boost/geometry/extensions/algorithms/dissolve.hpp | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
Modified: trunk/boost/geometry/extensions/algorithms/dissolve.hpp
==============================================================================
--- trunk/boost/geometry/extensions/algorithms/dissolve.hpp Thu Aug 15 12:04:15 2013 (r85359)
+++ trunk/boost/geometry/extensions/algorithms/dissolve.hpp 2013-08-15 17:03:59 EDT (Thu, 15 Aug 2013) (r85360)
@@ -67,7 +67,7 @@
typedef detail::overlay::backtrack_state state_type;
template <typename Operation, typename Rings, typename Turns>
- static inline void apply(std::size_t size_at_start,
+ static inline void apply(std::size_t size_at_start,
Rings& rings, typename boost::range_value<Rings>::type& ring,
Turns& turns, Operation& operation,
std::string const& ,
@@ -77,7 +77,7 @@
)
{
state.m_good = false;
-
+
// Make bad output clean
rings.resize(size_at_start);
ring.clear();
@@ -132,7 +132,7 @@
typedef detail::overlay::traverse
<
- false, false,
+ false, false,
Geometry, Geometry,
backtrack_for_dissolve<Geometry>
> traverser;
@@ -178,7 +178,7 @@
}
}
- detail::overlay::assign_parents(geometry, rings, selected);
+ detail::overlay::assign_parents(geometry, rings, selected, true);
return detail::overlay::add_rings<GeometryOut>(selected, geometry, rings, out);
}