|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r85869 - trunk/boost/geometry/algorithms
From: adam.wulkiewicz_at_[hidden]
Date: 2013-09-24 10:28:51
Author: awulkiew
Date: 2013-09-24 10:28:51 EDT (Tue, 24 Sep 2013)
New Revision: 85869
URL: http://svn.boost.org/trac/boost/changeset/85869
Log:
[geometry] fixed error in touches() for CCW Rings/Polygons.
Text files modified:
trunk/boost/geometry/algorithms/touches.hpp | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
Modified: trunk/boost/geometry/algorithms/touches.hpp
==============================================================================
--- trunk/boost/geometry/algorithms/touches.hpp Tue Sep 24 10:21:53 2013 (r85868)
+++ trunk/boost/geometry/algorithms/touches.hpp 2013-09-24 10:28:51 EDT (Tue, 24 Sep 2013) (r85869)
@@ -3,6 +3,7 @@
// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2013 Adam Wulkiewicz, Lodz, Poland.
// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
@@ -18,8 +19,8 @@
#include <deque>
#include <boost/geometry/geometries/concepts/check.hpp>
+#include <boost/geometry/algorithms/detail/overlay/overlay.hpp>
#include <boost/geometry/algorithms/detail/overlay/self_turn_points.hpp>
-#include <boost/geometry/algorithms/detail/overlay/get_turns.hpp>
#include <boost/geometry/algorithms/disjoint.hpp>
#include <boost/geometry/algorithms/intersects.hpp>
#include <boost/geometry/algorithms/num_geometries.hpp>
@@ -164,7 +165,8 @@
detail::get_turns::no_interrupt_policy policy;
boost::geometry::get_turns
<
- false, false,
+ detail::overlay::do_reverse<geometry::point_order<Geometry1>::value>::value,
+ detail::overlay::do_reverse<geometry::point_order<Geometry2>::value>::value,
detail::overlay::assign_null_policy
>(geometry1, geometry2, turns, policy);
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk