1 files changed, 15 insertions, 2 deletions
diff --git a/src/mbgl/util/math.hpp b/src/mbgl/util/math.hpp
index f969ecaedd..c18ce0c254 100644
--- a/src/mbgl/util/math.hpp
+++ b/src/mbgl/util/math.hpp
@@ -77,9 +77,9 @@ T mag(const S& a) {
     return std::sqrt(a.x * a.x + a.y * a.y);
 }
 
-template <typename S>
+template <typename T = double, typename S>
 S unit(const S& a) {
-    auto magnitude = mag(a);
+    auto magnitude = mag<T>(a);
     if (magnitude == 0) {
         return a;
     }
@@ -106,5 +106,18 @@ T smoothstep(T edge0, T edge1, T x) {
     return t * t * (T(3) - T(2) * t);
 }
 
+template <typename T>
+inline T division(const T dividend, const T divisor, const T nan) {
+    if (divisor == 0) {
+        if (dividend == 0) {
+            return nan;
+        } else {
+            return ::copysign(std::numeric_limits<T>::infinity(), dividend);
+        }
+    } else {
+        return dividend / divisor;
+    }
+}
+
 } // namespace util
 } // namespace mbgl