Changeset 77045 in webkit for trunk/Source/JavaScriptCore/wtf/MathExtras.h

Timestamp:

Jan 28, 2011, 9:02:31 PM (14 years ago)

Author:

Simon Fraser

Message:

2011-01-28 Simon Fraser <Simon Fraser>

Reviewed by Gavin Barraclough.

Add various clampToInt() methods to MathExtras.h
​https://bugs.webkit.org/show_bug.cgi?id=52910

Use clampToInteger() from MathExtras.h

• css/CSSParser.cpp: (WebCore::CSSParser::parseCounter):

File:

• trunk/Source/JavaScriptCore/wtf/MathExtras.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/wtf/MathExtras.h

@@ -27 +27 @@
 #define WTF_MathExtras_h
 
+#include <algorithm>
 #include <cmath>
 #include <float.h>
+#include <limits>
 #include <stdlib.h>
 
@@ -206 +208 @@
 inline float grad2rad(float g) { return g * piFloat / 200.0f; }
 
+inline int clampToInteger(double d)
+{
+    const double minIntAsDouble = std::numeric_limits<int>::min();
+    const double maxIntAsDouble = std::numeric_limits<int>::max();
+    return static_cast<int>(std::max(std::min(d, maxIntAsDouble), minIntAsDouble));
+}
+
+inline int clampToPositiveInteger(double d)
+{
+    const double maxIntAsDouble = std::numeric_limits<int>::max();
+    return static_cast<int>(std::max<double>(std::min(d, maxIntAsDouble), 0));
+}
+
+inline int clampToInteger(float d)
+{
+    const float minIntAsFloat = std::numeric_limits<int>::min();
+    const float maxIntAsFloat = std::numeric_limits<int>::max();
+    return static_cast<int>(std::max(std::min(d, maxIntAsFloat), minIntAsFloat));
+}
+
+inline int clampToPositiveInteger(float d)
+{
+    const float maxIntAsFloat = std::numeric_limits<int>::max();
+    return static_cast<int>(std::max<float>(std::min(d, maxIntAsFloat), 0));
+}
+
 #if !COMPILER(MSVC) && !COMPILER(WINSCW) && !(COMPILER(RVCT) && (OS(SYMBIAN) || PLATFORM(BREWMP)))
 using std::isfinite;