Remove optional impl for SkClampMax that relied on not wrapping, as in fact

we do sometimes (e.g. gradients).

git-svn-id: http://skia.googlecode.com/svn/trunk@1003 2bbb7eff-a529-9590-31e7-b0007b416f81

diff --git a/include/core/SkMath.h b/include/core/SkMath.h
index af1908374c73061f066b966bfb7f569205bbfda3..3e729042e369ba2db13cbde7357462c3a8cbf6bb 100644 (file)
--- a/include/core/SkMath.h
+++ b/include/core/SkMath.h
@@ -77,7 +77,6 @@ static inline int SkClampPos(int value) {
 
 /** Given an integer and a positive (max) integer, return the value
     pinned against 0 and max, inclusive.
-    Note: only works as long as max - value doesn't wrap around
     @param value    The value we want returned pinned between [0...max]
     @param max      The positive max value
     @return 0 if value < 0, max if value > max, else value
@@ -85,10 +84,6 @@ static inline int SkClampPos(int value) {
 static inline int SkClampMax(int value, int max) {
     // ensure that max is positive
     SkASSERT(max >= 0);
-    // ensure that if value is negative, max - value doesn't wrap around
-    SkASSERT(value >= 0 || max - value > 0);
-
-#ifdef SK_CPU_HAS_CONDITIONAL_INSTR
     if (value < 0) {
         value = 0;
     }
@@ -96,15 +91,6 @@ static inline int SkClampMax(int value, int max) {
         value = max;
     }
     return value;
-#else
-
-    int diff = max - value;
-    // clear diff if diff is positive
-    diff &= diff >> 31;
-
-    // clear the result if value < 0
-    return (value + diff) & ~(value >> 31);
-#endif
 }
 
 /** Given a positive value and a positive max, return the value