Changeset 89943 in webkit

Timestamp:

Jun 28, 2011, 11:26:06 AM (15 years ago)

Author:

macpherson@chromium.org

Message:

2011-06-28 Luke Macpherson <​macpherson@chromium.org>

Reviewed by Darin Adler.

Clean up integer clamping functions in MathExtras.h and support arbitrary numeric types and limits.
​https://bugs.webkit.org/show_bug.cgi?id=63469

• wtf/MathExtras.h: (defaultMinimumForClamp): Version of std::numeric_limits::min() that returns the largest negative value for floating point types. (defaultMaximumForClamp): Symmetric alias for std::numeric_limits::max() (clampTo): New templated clamping function that supports arbitrary output types. (clampToInteger): Use new clampTo template. (clampToFloat): Use new clampTo template. (clampToPositiveInteger): Use new clampTo template.

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• wtf/MathExtras.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-06-28  Luke Macpherson   <macpherson@chromium.org>
+
+        Reviewed by Darin Adler.
+
+        Clean up integer clamping functions in MathExtras.h and support arbitrary numeric types and limits.
+        https://bugs.webkit.org/show_bug.cgi?id=63469
+
+        * wtf/MathExtras.h:
+        (defaultMinimumForClamp):
+        Version of std::numeric_limits::min() that returns the largest negative value for floating point types.
+        (defaultMaximumForClamp):
+        Symmetric alias for std::numeric_limits::max()
+        (clampTo):
+        New templated clamping function that supports arbitrary output types.
+        (clampToInteger):
+        Use new clampTo template.
+        (clampToFloat):
+        Use new clampTo template.
+        (clampToPositiveInteger):
+        Use new clampTo template.
+
 2011-06-28  Adam Roben  <aroben@apple.com>
 

trunk/Source/JavaScriptCore/wtf/MathExtras.h

@@ -208 +208 @@
 inline float grad2rad(float g) { return g * piFloat / 200.0f; }
 
-inline int clampToInteger(double x)
-{
-    const double intMax = static_cast<double>(std::numeric_limits<int>::max());
-    const double intMin = static_cast<double>(std::numeric_limits<int>::min());
-    
-    if (x >= intMax)
-        return std::numeric_limits<int>::max();
-    if (x <= intMin)
-        return std::numeric_limits<int>::min();
-    return static_cast<int>(x);
-}
-
-inline float clampToFloat(double x)
-{
-    const double floatMax = static_cast<double>(std::numeric_limits<float>::max());
-    const double floatMin = -static_cast<double>(std::numeric_limits<float>::max());
-    
-    if (x >= floatMax)
-        return std::numeric_limits<float>::max();
-    if (x <= floatMin)
-        return -std::numeric_limits<float>::max();
-    return static_cast<float>(x);
-}
-
-inline int clampToPositiveInteger(double x)
-{
-    const double intMax = static_cast<double>(std::numeric_limits<int>::max());
-    
-    if (x >= intMax)
-        return std::numeric_limits<int>::max();
-    if (x <= 0)
-        return 0;
-    return static_cast<int>(x);
-}
-
-inline int clampToInteger(float x)
-{
-    const float intMax = static_cast<float>(std::numeric_limits<int>::max());
-    const float intMin = static_cast<float>(std::numeric_limits<int>::min());
-    
-    if (x >= intMax)
-        return std::numeric_limits<int>::max();
-    if (x <= intMin)
-        return std::numeric_limits<int>::min();
-    return static_cast<int>(x);
-}
-
-inline int clampToPositiveInteger(float x)
-{
-    const float intMax = static_cast<float>(std::numeric_limits<int>::max());
-    
-    if (x >= intMax)
-        return std::numeric_limits<int>::max();
-    if (x <= 0)
-        return 0;
-    return static_cast<int>(x);
+// std::numeric_limits<T>::min() returns the smallest positive value for floating point types
+template<typename T> inline T defaultMinimumForClamp() { return std::numeric_limits<T>::min(); }
+template<> inline float defaultMinimumForClamp() { return -std::numeric_limits<float>::max(); }
+template<> inline double defaultMinimumForClamp() { return -std::numeric_limits<double>::max(); }
+template<typename T> inline T defaultMaximumForClamp() { return std::numeric_limits<T>::max(); }
+
+template<typename T> inline T clampTo(double value, T min = defaultMinimumForClamp<T>(), T max = defaultMaximumForClamp<T>())
+{
+    if (value >= static_cast<double>(max))
+        return max;
+    if (value <= static_cast<double>(min))
+        return min;
+    return static_cast<T>(value);
+}
+template<> inline long long int clampTo(double, long long int, long long int); // clampTo does not support long long ints.
+
+inline int clampToInteger(double value)
+{
+    return clampTo<int>(value);
+}
+
+inline float clampToFloat(double value)
+{
+    return clampTo<float>(value);
+}
+
+inline int clampToPositiveInteger(double value)
+{
+    return clampTo<int>(value, 0);
+}
+
+inline int clampToInteger(float value)
+{
+    return clampTo<int>(value);
 }
 
@@ -269 +247 @@
 {
     const unsigned intMax = static_cast<unsigned>(std::numeric_limits<int>::max());
-    
+
     if (x >= intMax)
         return std::numeric_limits<int>::max();