map-per/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[search] Fix uint8_t overflow.

Browse source
This commit is contained in:
tatiana-yan 2019-12-10 12:51:28 +03:00 • committed by mpimenov
parent d6b5bd8b9a
commit 37903e73e6
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
search/ranker.cpp
View file

@ -448,11 +448,11 @@ class RankerResultMaker
{
switch (type)
{
case Model::TYPE_VILLAGE: return rank /= 1.5;
case Model::TYPE_VILLAGE: return rank / 1.5;
case Model::TYPE_CITY:
{
if (m_ranker.m_params.m_viewport.IsPointInside(center))
return rank * 2;
return base::Clamp(static_cast<int>(rank) * 2, 0, 0xFF);
storage::CountryInfo info;
if (country.empty())
@ -460,10 +460,10 @@ class RankerResultMaker
else
m_infoGetter.GetRegionInfo(country, info);
if (info.IsNotEmpty() && info.m_name == m_ranker.m_params.m_pivotRegion)
return rank *= 1.7;
return base::Clamp(static_cast<int>(rank * 1.7), 0, 0xFF);
}
case Model::TYPE_COUNTRY:
return rank /= 1.5;
return rank / 1.5;
default: return rank;
}