diff options
| author | Stephen Hines <srhines@google.com> | 2013-01-10 15:23:49 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-01-10 15:23:49 -0800 |
| commit | bb469bde8df551df8fc7347f38dcd8180fdfab17 (patch) | |
| tree | 705ba606e9c7fb13dc8a4b4358e8448bddc2130f /tests/RenderScriptTests | |
| parent | f8c8333f7daeaaf2581d7761c643003d83bab054 (diff) | |
| parent | 9be5f0a30653bfb3619726c96ec4a03c3b1c7996 (diff) | |
| download | frameworks_base-bb469bde8df551df8fc7347f38dcd8180fdfab17.zip frameworks_base-bb469bde8df551df8fc7347f38dcd8180fdfab17.tar.gz frameworks_base-bb469bde8df551df8fc7347f38dcd8180fdfab17.tar.bz2 | |
Merge "Add parentheses for latest Clang warnings."
Diffstat (limited to 'tests/RenderScriptTests')
| -rw-r--r-- | tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/colorcube.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/colorcube.rs b/tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/colorcube.rs index 5250474..fda0d1e 100644 --- a/tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/colorcube.rs +++ b/tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/colorcube.rs @@ -62,10 +62,10 @@ void root(const uchar4 *in, uchar4 *out, uint32_t x, uint32_t y) { uint4 yz01 = ((v001 * weight1.x) + (v101 * weight2.x)) >> (int4)8; uint4 yz11 = ((v011 * weight1.x) + (v111 * weight2.x)) >> (int4)8; - uint4 z0 = (yz00 * weight1.y) + (yz10 * weight2.y) >> (int4)16; - uint4 z1 = (yz01 * weight1.y) + (yz11 * weight2.y) >> (int4)16; + uint4 z0 = ((yz00 * weight1.y) + (yz10 * weight2.y)) >> (int4)16; + uint4 z1 = ((yz01 * weight1.y) + (yz11 * weight2.y)) >> (int4)16; - uint4 v = (z0 * weight1.z) + (z1 * weight2.z) >> (int4)16; + uint4 v = ((z0 * weight1.z) + (z1 * weight2.z)) >> (int4)16; uint4 v2 = (v + 0x7f) >> (int4)8; *out = convert_uchar4(v2); |