diff options
Diffstat (limited to 'include/mbgl')
| -rw-r--r-- | include/mbgl/math/log2.hpp | 13 | ||||
| -rw-r--r-- | include/mbgl/util/constants.hpp | 2 |
2 files changed, 1 insertions, 14 deletions
diff --git a/include/mbgl/math/log2.hpp b/include/mbgl/math/log2.hpp index 53d5e45545..6a1ba23ed9 100644 --- a/include/mbgl/math/log2.hpp +++ b/include/mbgl/math/log2.hpp @@ -2,7 +2,6 @@ #include <cmath> #include <cstdint> -#include <type_traits> namespace mbgl { namespace util { @@ -11,17 +10,5 @@ namespace util { // (== number of bits required to store x) uint32_t ceil_log2(uint64_t x); -template <typename T> -typename std::enable_if_t<std::is_floating_point<T>::value, T> log2(T x) -{ -// log2() is producing wrong results on ARMv5 binaries -// running on ARMv7+ CPUs. -#if defined(__ANDROID__) - return ::log(x) / M_LN2; -#else - return ::log2(x); -#endif -} - } // namespace util } // namespace mbgl diff --git a/include/mbgl/util/constants.hpp b/include/mbgl/util/constants.hpp index d5e55065c4..7110d9e26b 100644 --- a/include/mbgl/util/constants.hpp +++ b/include/mbgl/util/constants.hpp @@ -11,7 +11,7 @@ namespace mbgl { namespace util { -constexpr float tileSize = 512; +constexpr double tileSize = 512; /* * The maximum extent of a feature that can be safely stored in the buffer. |