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

Correct ClampPoint (do not use double->uint32_t conversion).

Browse source
This commit is contained in:
vng 2011-03-26 19:06:25 +02:00 • committed by Alex Zolotarev
parent 688034aaf8
commit adc6929a8d
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
indexer/geometry_coding.cpp
View file

@ -11,12 +11,14 @@
namespace
{
template <typename T>
inline m2::PointU ClampPoint(m2::PointU const & maxPoint, m2::Point<T> const & point)
inline m2::PointU ClampPoint(m2::PointU const & maxPoint, m2::Point<double> const & point)
{
typedef m2::PointU::value_type uvalue_t;
return m2::PointU(my::clamp(static_cast<uvalue_t>(point.x), static_cast<uvalue_t>(0), maxPoint.x),
my::clamp(static_cast<uvalue_t>(point.y), static_cast<uvalue_t>(0), maxPoint.y));
//return m2::PointU(my::clamp(static_cast<uvalue_t>(point.x), static_cast<uvalue_t>(0), maxPoint.x),
// my::clamp(static_cast<uvalue_t>(point.y), static_cast<uvalue_t>(0), maxPoint.y));
return m2::PointU(static_cast<uvalue_t>(my::clamp(point.x, 0.0, static_cast<double>(maxPoint.x))),
static_cast<uvalue_t>(my::clamp(point.y, 0.0, static_cast<double>(maxPoint.y))));
}
}