Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Fixes integer overflow due to fixed / floating mismatch in coordinate interpolation

Browse Source
This commit is contained in:
Daniel J. Hofmann 2016-03-22 11:01:37 +01:00 committed by Patrick Niklaus
parent a86f09a1f7
commit 776c0d0ae2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/util/coordinate_calculation.cpp
View File

@ -261,10 +261,10 @@ Coordinate interpolateLinear(double factor, const Coordinate from, const Coordin
{
BOOST_ASSERT(0 <= factor && factor <= 1.0);
FloatLongitude interpolated_lon{((1. - factor) * static_cast<std::int32_t>(from.lon)) +
(factor * static_cast<std::int32_t>(to.lon))};
FloatLatitude interpolated_lat{((1. - factor) * static_cast<std::int32_t>(from.lat)) +
(factor * static_cast<std::int32_t>(to.lat))};
FixedLongitude interpolated_lon(((1. - factor) * static_cast<std::int32_t>(from.lon)) +
(factor * static_cast<std::int32_t>(to.lon)));
FixedLatitude interpolated_lat(((1. - factor) * static_cast<std::int32_t>(from.lat)) +
(factor * static_cast<std::int32_t>(to.lat)));
return {std::move(interpolated_lon), std::move(interpolated_lat)};
}