AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Fixing DoubleToUint32() and Uint32ToDouble().

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2017-10-04 18:10:47 +03:00 • committed by Vladimir Byko-Ianko
parent e93da422f4
commit 98d9ac00e4
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
coding/point_to_integer.cpp
View file

@ -73,11 +73,15 @@ m2::RectD Int64ToRect(std::pair<int64_t, int64_t> const & p, uint32_t coordBits)
uint32_t DoubleToUint32(double x, double min, double max, uint32_t coordBits)
{
ASSERT_GREATER_OR_EQUAL(coordBits, 1, ());
ASSERT_LESS_OR_EQUAL(coordBits, 32, ());
x = my::clamp(x, min, max);
return static_cast<uint32_t>(0.5 + (x - min) / (max - min) * ((1 << coordBits) - 1));
return static_cast<uint32_t>(0.5 + (x - min) / (max - min) * bits::GetFullMask(static_cast<uint8_t>(coordBits)));
}
double Uint32ToDouble(uint32_t x, double min, double max, uint32_t coordBits)
{
return min + static_cast<double>(x) * (max - min) / ((1 << coordBits) - 1);
ASSERT_GREATER_OR_EQUAL(coordBits, 1, ());
ASSERT_LESS_OR_EQUAL(coordBits, 32, ());
return min + static_cast<double>(x) * (max - min) / bits::GetFullMask(static_cast<uint8_t>(coordBits));
}

2
routing_common/transit_serdes.hpp
View file

@ -30,7 +30,7 @@ namespace transit
// Let us assume that it takes less than 10^7 seconds (115 days) to get from one station to a neighboring one.
double constexpr kMinDoubleAtTransit = kInvalidWeight;
double constexpr kMaxDoubleAtTransit = 10000000.0;
uint32_t constexpr kDoubleBits = 31;
uint32_t constexpr kDoubleBits = 32;
template <typename Sink>
class Serializer