3 files changed, 6 insertions, 8 deletions
diff --git a/java/tests/ImageProcessing/src/com/android/rs/image/bwfilter.rs b/java/tests/ImageProcessing/src/com/android/rs/image/bwfilter.rs
index e2116209..23f64f59 100644
--- a/java/tests/ImageProcessing/src/com/android/rs/image/bwfilter.rs
+++ b/java/tests/ImageProcessing/src/com/android/rs/image/bwfilter.rs
@@ -48,5 +48,5 @@ void bwFilterKernel(const uchar4 *in, uchar4 *out) {
     localMax = fmax(g,b);
     localMax = fmax(r,localMax);
     avg = (localMin+localMax) * 0.5f;
-    out->r = out->g = out->b = rsClamp(avg, 0, 255);
+    out->r = out->g = out->b = clamp((int) avg, 0, 255);
 }
diff --git a/java/tests/ImageProcessing/src/com/android/rs/image/threshold.rs b/java/tests/ImageProcessing/src/com/android/rs/image/threshold.rs
index 40d4fa2d..1309df59 100644
--- a/java/tests/ImageProcessing/src/com/android/rs/image/threshold.rs
+++ b/java/tests/ImageProcessing/src/com/android/rs/image/threshold.rs
@@ -85,7 +85,7 @@ uchar4 RS_KERNEL vert(uint32_t x, uint32_t y) {
         }
     } else {
         for (int r = -radius; r <= radius; r ++) {
-            int validH = rsClamp((int)y + r, (int)0, (int)(height - 1));
+            int validH = clamp((int)y + r, (int)0, (int)(height - 1));
             float4 i = rsGetElementAt_float4(ScratchPixel2, x, validH);
             blurredPixel += i.xyz * gaussian[gi++];
         }
@@ -107,7 +107,7 @@ float4 RS_KERNEL horz(uint32_t x, uint32_t y) {
     } else {
         for (int r = -radius; r <= radius; r ++) {
             // Stepping left and right away from the pixel
-            int validX = rsClamp((int)x + r, (int)0, (int)(width - 1));
+            int validX = clamp((int)x + r, (int)0, (int)(width - 1));
             float4 i = rsGetElementAt_float4(ScratchPixel1, validX, y);
             blurredPixel += i * gaussian[gi++];
         }
@@ -115,4 +115,3 @@ float4 RS_KERNEL horz(uint32_t x, uint32_t y) {
 
     return blurredPixel;
 }
-
diff --git a/java/tests/ImageProcessing/src/com/android/rs/image/vibrance.rs b/java/tests/ImageProcessing/src/com/android/rs/image/vibrance.rs
index 865c77ef..acd9cf9a 100644
--- a/java/tests/ImageProcessing/src/com/android/rs/image/vibrance.rs
+++ b/java/tests/ImageProcessing/src/com/android/rs/image/vibrance.rs
@@ -35,7 +35,6 @@ uchar4 RS_KERNEL vibranceKernel(uchar4 in) {
     float Rt = Rf * MS;
     float Gt = Gf * MS;
     float Bt = Bf * MS;
-    int t = (r + g) >> 1;
 
     float R = r;
     float G = g;
@@ -46,9 +45,9 @@ uchar4 RS_KERNEL vibranceKernel(uchar4 in) {
     float Bc = R * Rt + G * Gt + B * (Bt + S);
 
     uchar4 o;
-    o.r = rsClamp(Rc, 0, 255);
-    o.g = rsClamp(Gc, 0, 255);
-    o.b = rsClamp(Bc, 0, 255);
+    o.r = clamp((int) Rc, 0, 255);
+    o.g = clamp((int) Gc, 0, 255);
+    o.b = clamp((int) Bc, 0, 255);
     o.a = 0xff;
     return o;
 }