diff options
| author | Jason Sams <jsams@google.com> | 2013-05-29 11:53:13 -0700 |
|---|---|---|
| committer | Jason Sams <jsams@google.com> | 2013-05-29 11:53:13 -0700 |
| commit | 579c00efd6a2840856bdad1e9a5d9b5dae248312 (patch) | |
| tree | aaace20cfb1b9a555f3fb14645a94b5fedec76c1 /tests/CanvasCompare | |
| parent | 3bf4fa4b161342ac94e97844c7af0982f4a2758d (diff) | |
| download | frameworks_base-579c00efd6a2840856bdad1e9a5d9b5dae248312.zip frameworks_base-579c00efd6a2840856bdad1e9a5d9b5dae248312.tar.gz frameworks_base-579c00efd6a2840856bdad1e9a5d9b5dae248312.tar.bz2 | |
Fix ambiguous clamp.
Change-Id: I75a55bbfe6b8ef68242c8ecd0f70ef218829d110
Diffstat (limited to 'tests/CanvasCompare')
| -rw-r--r-- | tests/CanvasCompare/src/com/android/test/hwuicompare/errorCalculator.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/CanvasCompare/src/com/android/test/hwuicompare/errorCalculator.rs b/tests/CanvasCompare/src/com/android/test/hwuicompare/errorCalculator.rs index 668f61d..3681784 100644 --- a/tests/CanvasCompare/src/com/android/test/hwuicompare/errorCalculator.rs +++ b/tests/CanvasCompare/src/com/android/test/hwuicompare/errorCalculator.rs @@ -49,8 +49,8 @@ void displayDifference(const uchar4 *v_in, uchar4 *v_out, uint32_t x, uint32_t y float4 diff = idealPixel - givenPixel; float totalDiff = diff.x + diff.y + diff.z + diff.w; if (totalDiff < 0) { - v_out[0] = rsPackColorTo8888(0, 0, clamp(-totalDiff/2, 0, 1)); + v_out[0] = rsPackColorTo8888(0, 0, clamp(-totalDiff/2.f, 0.f, 1.f)); } else { - v_out[0] = rsPackColorTo8888(clamp(totalDiff/2, 0, 1), 0, 0); + v_out[0] = rsPackColorTo8888(clamp(totalDiff/2.f, 0.f, 1.f), 0, 0); } } |