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

fix build with clang/libcxx on linux

Browse source 
This closes #3807 issue. Because of clang/libcxx 3.8 have overload of
`floor` function in math.h for `float` and `double` we got compilation
error, but obvious fix:
1.0 -> 1.0f
not works, because of at least on Android we have no floor(float)
overload. So force usage of floor(double) which exists on every platform.
This commit is contained in:
Evgeniy A. Dushistov 2016-10-10 01:49:52 +03:00
parent 75b38035b7
commit fcd5fe3c5f
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drape_frontend/text_layout.cpp
View file

@ -561,7 +561,7 @@ void PathTextLayout::CalculatePositions(vector<float> & offsets, float splineLen
}
else
{
double const textCount = max(floor(pathLength / minPeriodSize), 1.0);
double const textCount = max(floor(static_cast<double>(pathLength / minPeriodSize)), 1.0);
double const glbTextLen = splineLength / textCount;
for (double offset = 0.5 * glbTextLen; offset < splineLength; offset += glbTextLen)
offsets.push_back(offset);