[Boost-commit] svn:boost r78795 - trunk/boost/geometry/algorithms/detail/overlay

Subject: [Boost-commit] svn:boost r78795 - trunk/boost/geometry/algorithms/detail/overlay
From: barend.gehrels_at_[hidden]
Date: 2012-06-01 17:43:56

Author: barendgehrels
Date: 2012-06-01 17:43:56 EDT (Fri, 01 Jun 2012)
New Revision: 78795
URL: http://svn.boost.org/trac/boost/changeset/78795

Log:
[geometry] fix of failing disjoint for polygon/box
Text files modified: 
   trunk/boost/geometry/algorithms/detail/overlay/get_turns.hpp |    13 ++++++++++---                           
   1 files changed, 10 insertions(+), 3 deletions(-)

Modified: trunk/boost/geometry/algorithms/detail/overlay/get_turns.hpp
==============================================================================
--- trunk/boost/geometry/algorithms/detail/overlay/get_turns.hpp	(original)
+++ trunk/boost/geometry/algorithms/detail/overlay/get_turns.hpp	2012-06-01 17:43:56 EDT (Fri, 01 Jun 2012)
@@ -495,7 +495,7 @@
                 int source_id1, Range const& range,
                 int source_id2, Box const& box,
                 Turns& turns,
-                InterruptPolicy& ,
+                InterruptPolicy& interrupt_policy,
                 int multi_index = -1, int ring_index = -1)
     {
         if (boost::size(range) <= 1)
@@ -557,7 +557,7 @@
                 get_turns_with_box(seg_id, source_id2,
                         *prev, *it, *next,
                         bp[0], bp[1], bp[2], bp[3],
-                        turns);
+                        turns, interrupt_policy);
                 // Future performance enhancement: 
                 // return if told by the interrupt policy 
             }
@@ -596,7 +596,8 @@
             box_point_type const& bp2,
             box_point_type const& bp3,
             // Output
-            Turns& turns)
+            Turns& turns,
+            InterruptPolicy& interrupt_policy)
     {
         // Depending on code some relations can be left out
 
@@ -622,6 +623,12 @@
         ti.operations[1].seg_id = segment_identifier(source_id2, -1, -1, 3);
         TurnPolicy::apply(rp0, rp1, rp2, bp3, bp0, bp1,
                 ti, std::back_inserter(turns));
+
+        if (InterruptPolicy::enabled)
+        {
+            interrupt_policy.apply(turns);
+        }
+
     }
 
 };