diff options
| author | Jason Sams <rjsams@android.com> | 2010-06-24 17:56:34 -0700 |
|---|---|---|
| committer | Jason Sams <rjsams@android.com> | 2010-06-24 17:56:34 -0700 |
| commit | 6495128049975815e46081874b8ede8efddad2f4 (patch) | |
| tree | e48ff291bedc84ada5f683aa0bcebb26e0d322fe /libs/rs/scriptc | |
| parent | 8f31bd6b68c796d4a4176721a6e13bfdba2166e0 (diff) | |
| download | frameworks_base-6495128049975815e46081874b8ede8efddad2f4.zip frameworks_base-6495128049975815e46081874b8ede8efddad2f4.tar.gz frameworks_base-6495128049975815e46081874b8ede8efddad2f4.tar.bz2 | |
Fix return values for rsClamp.
Change-Id: Ic9980a2304797a74392c729d6b8ec9f477a906d6
Diffstat (limited to 'libs/rs/scriptc')
| -rw-r--r-- | libs/rs/scriptc/rs_core.rsh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libs/rs/scriptc/rs_core.rsh b/libs/rs/scriptc/rs_core.rsh index 91b30b9..463550f 100644 --- a/libs/rs/scriptc/rs_core.rsh +++ b/libs/rs/scriptc/rs_core.rsh @@ -480,22 +480,22 @@ rsMatrixMultiply(rs_matrix2x2 *m, float2 in) { // int ops ///////////////////////////////////////////////////// -__inline__ static float __attribute__((overloadable, always_inline)) rsClamp(uint amount, uint low, uint high) { +__inline__ static uint __attribute__((overloadable, always_inline)) rsClamp(uint amount, uint low, uint high) { return amount < low ? low : (amount > high ? high : amount); } -__inline__ static float __attribute__((overloadable, always_inline)) rsClamp(int amount, int low, int high) { +__inline__ static int __attribute__((overloadable, always_inline)) rsClamp(int amount, int low, int high) { return amount < low ? low : (amount > high ? high : amount); } -__inline__ static float __attribute__((overloadable, always_inline)) rsClamp(ushort amount, ushort low, ushort high) { +__inline__ static ushort __attribute__((overloadable, always_inline)) rsClamp(ushort amount, ushort low, ushort high) { return amount < low ? low : (amount > high ? high : amount); } -__inline__ static float __attribute__((overloadable, always_inline)) rsClamp(short amount, short low, short high) { +__inline__ static short __attribute__((overloadable, always_inline)) rsClamp(short amount, short low, short high) { return amount < low ? low : (amount > high ? high : amount); } -__inline__ static float __attribute__((overloadable, always_inline)) rsClamp(uchar amount, uchar low, uchar high) { +__inline__ static uchar __attribute__((overloadable, always_inline)) rsClamp(uchar amount, uchar low, uchar high) { return amount < low ? low : (amount > high ? high : amount); } -__inline__ static float __attribute__((overloadable, always_inline)) rsClamp(char amount, char low, char high) { +__inline__ static char __attribute__((overloadable, always_inline)) rsClamp(char amount, char low, char high) { return amount < low ? low : (amount > high ? high : amount); } |
