Imported Upstream version 1.72.0

[platform/upstream/boost.git] / boost / geometry / algorithms / detail / overlay / get_intersection_points.hpp

diff --git a/boost/geometry/algorithms/detail/overlay/get_intersection_points.hpp b/boost/geometry/algorithms/detail/overlay/get_intersection_points.hpp
index 5a33603..4b0e9ed 100644 (file)
--- a/boost/geometry/algorithms/detail/overlay/get_intersection_points.hpp
+++ b/boost/geometry/algorithms/detail/overlay/get_intersection_points.hpp
@@ -22,11 +22,10 @@
 
 #include <boost/geometry/algorithms/convert.hpp>
 #include <boost/geometry/algorithms/detail/overlay/get_turns.hpp>
+#include <boost/geometry/policies/robustness/rescale_policy_tags.hpp>
 
 #include <boost/geometry/geometries/segment.hpp>
 
-#include <boost/geometry/policies/robustness/robust_point_type.hpp>
-
 namespace boost { namespace geometry
 {
 
@@ -56,45 +55,25 @@ struct get_turn_without_info
                 UniqueSubRange2 const& range_q,
                 TurnInfo const& ,
                 Strategy const& strategy,
-                RobustPolicy const& robust_policy,
+                RobustPolicy const& ,
                 OutputIterator out)
     {
+        // Make sure this is only called with no rescaling
+        BOOST_STATIC_ASSERT((boost::is_same
+           <
+               no_rescale_policy_tag,
+               typename rescale_policy_type<RobustPolicy>::type
+           >::value));
+
         typedef typename TurnInfo::point_type turn_point_type;
 
         typedef policies::relate::segments_intersection_points
             <
-                segment_intersection_points
-                    <
-                        turn_point_type,
-                        typename geometry::segment_ratio_type
-                            <
-                                turn_point_type, RobustPolicy
-                            >::type
-                    >
+                segment_intersection_points<turn_point_type>
             > policy_type;
 
-        typedef model::referring_segment<Point1 const> segment_type1;
-        typedef model::referring_segment<Point2 const> segment_type2;
-        Point1 const& pi = range_p.at(0);
-        Point1 const& pj = range_p.at(1);
-        Point2 const& qi = range_q.at(0);
-        Point2 const& qj = range_q.at(1);
-        segment_type1 p1(pi, pj);
-        segment_type2 q1(qi, qj);
-
-        typedef typename geometry::robust_point_type
-            <
-                Point1, RobustPolicy
-            >::type robust_point_type;
-
-        robust_point_type pi_rob, pj_rob, qi_rob, qj_rob;
-        geometry::recalculate(pi_rob, pi, robust_policy);
-        geometry::recalculate(pj_rob, pj, robust_policy);
-        geometry::recalculate(qi_rob, qi, robust_policy);
-        geometry::recalculate(qj_rob, qj, robust_policy);
-        typename policy_type::return_type result
-            = strategy.apply(p1, q1, policy_type(), robust_policy,
-                             pi_rob, pj_rob, qi_rob, qj_rob);
+        typename policy_type::return_type const result
+            = strategy.apply(range_p, range_q, policy_type());
 
         for (std::size_t i = 0; i < result.count; i++)
         {