From f1c051b6f2892ba56f9d8b9b8b309e5b914af387 Mon Sep 17 00:00:00 2001 From: Jason Sams Date: Tue, 21 Aug 2012 15:54:07 -0700 Subject: Fix bug in grain. Compare with 0 was done against unsigned which did not correctly clamp. Change-Id: I6dbff36190c279961017e57db3aaba51c60a0ad3 --- .../ImageProcessing/src/com/android/rs/image/grain.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/RenderScriptTests/ImageProcessing/src/com') diff --git a/tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/grain.rs b/tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/grain.rs index 97ae4fb..7d9d3ac 100644 --- a/tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/grain.rs +++ b/tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/grain.rs @@ -43,10 +43,10 @@ int32_t gHeight; rs_allocation gBlendSource; void blend9(uchar *out, uint32_t x, uint32_t y) { - uint32_t x1 = min(x+1, (uint32_t)gWidth); - uint32_t x2 = max(x-1, (uint32_t)0); - uint32_t y1 = min(y+1, (uint32_t)gHeight); - uint32_t y2 = max(y-1, (uint32_t)0); + uint32_t x1 = min((int32_t)x+1, (int32_t)gWidth); + uint32_t x2 = max((int32_t)x-1, (int32_t)0); + uint32_t y1 = min((int32_t)y+1, (int32_t)gHeight); + uint32_t y2 = max((int32_t)y-1, (int32_t)0); uint p00 = 56 * ((uchar *)rsGetElementAt(gBlendSource, x1, y1))[0]; uint p01 = 114 * ((uchar *)rsGetElementAt(gBlendSource, x, y1))[0]; -- cgit v1.1