From b26c2d62b80d6bee148fbfe01eb36809bfa721ea Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Fri, 29 Jun 2018 21:19:23 -0400 Subject: [PATCH] geo get_distance_to_arc remove double promotion --- geo/geo.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/geo/geo.cpp b/geo/geo.cpp index 9ba944c676..46b2b3ffb0 100644 --- a/geo/geo.cpp +++ b/geo/geo.cpp @@ -501,8 +501,8 @@ int get_distance_to_arc(struct crosstrack_error_s *crosstrack_error, double lat_ double lat_start = lat_now + start_disp_y * cos(lat_now) / 111111.0; double lon_end = lon_now + end_disp_x / 111111.0; double lat_end = lat_now + end_disp_y * cos(lat_now) / 111111.0; - double dist_to_start = get_distance_to_next_waypoint(lat_now, lon_now, lat_start, lon_start); - double dist_to_end = get_distance_to_next_waypoint(lat_now, lon_now, lat_end, lon_end); + float dist_to_start = get_distance_to_next_waypoint(lat_now, lon_now, lat_start, lon_start); + float dist_to_end = get_distance_to_next_waypoint(lat_now, lon_now, lat_end, lon_end); if (dist_to_start < dist_to_end) { crosstrack_error->distance = dist_to_start;