diff options
| author | vng <viktor.govako@gmail.com> | 2011-03-26 20:06:25 +0300 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 01:14:19 +0300 |
| commit | adc6929a8d0b79f67cf16dab134033b4eb2fee85 (patch) | |
| tree | 794cba67be9d692e41df5a9a0b82352b85888455 /indexer/geometry_coding.cpp | |
| parent | 688034aaf8d9377a0640a842ab6ac67955b069f5 (diff) | |
Correct ClampPoint (do not use double->uint32_t conversion).
Diffstat (limited to 'indexer/geometry_coding.cpp')
| -rw-r--r-- | indexer/geometry_coding.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/indexer/geometry_coding.cpp b/indexer/geometry_coding.cpp index 502ff17d6c..5c41176501 100644 --- a/indexer/geometry_coding.cpp +++ b/indexer/geometry_coding.cpp @@ -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)))); } } |