AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
we do sometimes (e.g. gradients).



git-svn-id: http://skia.googlecode.com/svn/trunk@1003 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
reed@google.com 2011-03-24 19:17:31 +00:00
parent 0f185c2709
commit b123c9d997
1 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/core/SkMath.h
View File

@ -77,7 +77,6 @@ static inline int SkClampPos(int value) {
/** Given an integer and a positive (max) integer, return the value /** Given an integer and a positive (max) integer, return the value
pinned against 0 and max, inclusive. 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 value The value we want returned pinned between [0...max]
@param max The positive max value @param max The positive max value
@return 0 if value < 0, max if value > max, else 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) { static inline int SkClampMax(int value, int max) {
// ensure that max is positive // ensure that max is positive
SkASSERT(max >= 0); 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) { if (value < 0) {
value = 0; value = 0;
} }
@ -96,15 +91,6 @@ static inline int SkClampMax(int value, int max) {
value = max; value = max;
} }
return value; 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 /** Given a positive value and a positive max, return the value