Henri Verbeet : d2d1/tests: Introduce compare_uint().
Alexandre Julliard
julliard at winehq.org
Mon Mar 30 16:24:28 CDT 2020
Module: wine
Branch: master
Commit: 1cb9a31bdfed9eb79769541a5fb36094bb65d636
URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cb9a31bdfed9eb79769541a5fb36094bb65d636
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Mon Mar 30 20:48:13 2020 +0430
d2d1/tests: Introduce compare_uint().
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/d2d1/tests/d2d1.c | 23 +++++++++++------------
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c
index 8548a0a4aa..7c0ee91099 100644
--- a/dlls/d2d1/tests/d2d1.c
+++ b/dlls/d2d1/tests/d2d1.c
@@ -346,20 +346,19 @@ static DWORD get_readback_colour(struct resource_readback *rb, unsigned int x, u
return ((DWORD *)((BYTE *)rb->map_desc.pData + y * rb->map_desc.RowPitch))[x];
}
+static BOOL compare_uint(unsigned int x, unsigned int y, unsigned int max_diff)
+{
+ unsigned int diff = x > y ? x - y : y - x;
+
+ return diff <= max_diff;
+}
+
static BOOL compare_colour(DWORD c1, DWORD c2, BYTE max_diff)
{
- if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff)
- return FALSE;
- c1 >>= 8; c2 >>= 8;
- if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff)
- return FALSE;
- c1 >>= 8; c2 >>= 8;
- if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff)
- return FALSE;
- c1 >>= 8; c2 >>= 8;
- if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff)
- return FALSE;
- return TRUE;
+ return compare_uint(c1 & 0xff, c2 & 0xff, max_diff)
+ && compare_uint((c1 >> 8) & 0xff, (c2 >> 8) & 0xff, max_diff)
+ && compare_uint((c1 >> 16) & 0xff, (c2 >> 16) & 0xff, max_diff)
+ && compare_uint((c1 >> 24) & 0xff, (c2 >> 24) & 0xff, max_diff);
}
static BOOL compare_float(float f, float g, unsigned int ulps)
More information about the wine-cvs
mailing list