boost_mirror/geometry
1
0
Fork 0
mirror of https://github.com/boostorg/geometry.git synced 2025-05-09 23:24:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/shortest_points_new_strategies_non_cartesian' of github.com:vissarion/geometry into feature/shortest_points_new_strategies_non_cartesian

Browse Source
This commit is contained in:
Vissarion Fisikopoulos 2021-12-02 16:52:52 +02:00
commit 588fe9e751
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/boost/geometry/algorithms/detail/closest_points/point_to_geometry.hpp
View File

@ -127,11 +127,7 @@ public:
cd_min);
auto closest_point = strategies.closest_points(point, range)
<<<<<<< HEAD
.apply(point, *it_pair.first, *it_pair.second);
=======
.apply(point, *closest_segment.first, *closest_segment.second);
>>>>>>> 20da3054d5f65b064aadfe310d4643adc9c6fef7
set_segment_from_points::apply(point, closest_point, shortest_seg);
}