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

Review fixes.

Browse source
This commit is contained in:
vng 2015-07-08 19:29:40 +03:00 • committed by Alex Zolotarev
parent a70a4a0933
commit ef3f0d1292
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
3party/succinct/bit_vector.hpp
View file

@ -113,7 +113,7 @@ namespace succinct {
n -= 64;
}
if (n) {
append_bits(uint64_t(-1) >> (64 - n), util::to_size(n));
append_bits(uint64_t(-1) >> (64 - n), static_cast<uint8_t>(n));
}
}

6
render/feature_styler.cpp
View file

@ -34,12 +34,8 @@ namespace
namespace di
{
DrawRule::DrawRule(drule::BaseRule const * p, double depth)
: m_rule(p), m_depth(depth)
: m_rule(p), m_depth(my::clamp(depth, graphics::minDepth, graphics::maxDepth))
{
if (m_depth < graphics::minDepth)
m_depth = graphics::minDepth;
else if (m_depth > graphics::maxDepth)
m_depth = graphics::maxDepth;
}
uint32_t DrawRule::GetID(size_t threadSlot) const