Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix return values for rsClamp."

Browse Source
This commit is contained in:
Jason Sams
2010-06-24 17:57:18 -07:00
committed by Android (Google) Code Review
parent ab3c7d2a8c 6495128049
commit ad02a9b64f
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libs/rs/scriptc/rs_core.rsh
View File

@@ -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);
}