From fdac1fb86d1908599fad9e4fa1006e73df60a33a Mon Sep 17 00:00:00 2001 From: Barend Gehrels Date: Wed, 5 Dec 2018 11:24:50 +0100 Subject: [PATCH] [get_turn_info] now pi/qi are neither necessary, being used only once --- .../algorithms/detail/overlay/get_turn_info_la.hpp | 5 +---- .../algorithms/detail/overlay/get_turn_info_ll.hpp | 10 +++------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/include/boost/geometry/algorithms/detail/overlay/get_turn_info_la.hpp b/include/boost/geometry/algorithms/detail/overlay/get_turn_info_la.hpp index d497339e3..964639658 100644 --- a/include/boost/geometry/algorithms/detail/overlay/get_turn_info_la.hpp +++ b/include/boost/geometry/algorithms/detail/overlay/get_turn_info_la.hpp @@ -64,9 +64,6 @@ struct get_turn_info_linear_areal RobustPolicy > inters_info; - typename UniqueSubRange1::point_type const& pi = range_p.at(0); - typename UniqueSubRange2::point_type const& qi = range_q.at(0); - inters_info inters(range_p, range_q, intersection_strategy, robust_policy); @@ -354,7 +351,7 @@ struct get_turn_info_linear_areal only_convert::apply(tp, inters.i_info()); if ( range_p.is_first() - && equals::equals_point_point(pi, tp.point) ) + && equals::equals_point_point(range_p.at(0), tp.point) ) { tp.operations[0].position = position_front; } diff --git a/include/boost/geometry/algorithms/detail/overlay/get_turn_info_ll.hpp b/include/boost/geometry/algorithms/detail/overlay/get_turn_info_ll.hpp index d307cda37..ee498cb07 100644 --- a/include/boost/geometry/algorithms/detail/overlay/get_turn_info_ll.hpp +++ b/include/boost/geometry/algorithms/detail/overlay/get_turn_info_ll.hpp @@ -59,11 +59,7 @@ struct get_turn_info_linear_linear RobustPolicy > inters_info; - typename UniqueSubRange1::point_type const& pi = range_p.at(0); - typename UniqueSubRange2::point_type const& qi = range_q.at(0); - - inters_info inters(range_p, range_q, - strategy, robust_policy); + inters_info inters(range_p, range_q, strategy, robust_policy); char const method = inters.d_info().how; @@ -408,7 +404,7 @@ struct get_turn_info_linear_linear // if any, only one of those should be true if ( range_p.is_first() - && equals::equals_point_point(pi, tp.point) ) + && equals::equals_point_point(range_p.at(0), tp.point) ) { tp.operations[0].position = position_front; } @@ -418,7 +414,7 @@ struct get_turn_info_linear_linear tp.operations[0].position = position_back; } else if ( range_q.is_first() - && equals::equals_point_point(qi, tp.point) ) + && equals::equals_point_point(range_q.at(0), tp.point) ) { tp.operations[1].position = position_front; }