diff options
| author | marha <marha@users.sourceforge.net> | 2012-01-11 08:55:02 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-01-11 08:57:05 +0100 |
| commit | a73c45b7c72c6e426e1c75dd939f5481227b6979 (patch) | |
| tree | aba5ced82f492a7e28dfa683144dfbd6293d9613 /pixman/test/region-contains-test.c | |
| parent | d60b5206a10c9d547a7230a991593b516e412204 (diff) | |
| parent | 38e661c7d82fa0b34fbe9b3f3261295787bb6427 (diff) | |
| download | vcxsrv-a73c45b7c72c6e426e1c75dd939f5481227b6979.tar.gz vcxsrv-a73c45b7c72c6e426e1c75dd939f5481227b6979.tar.bz2 vcxsrv-a73c45b7c72c6e426e1c75dd939f5481227b6979.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
pixman/pixman/pixman-trap.c
xorg-server/Xext/xace.c
xorg-server/dix/dispatch.c
xorg-server/hw/xwin/winclipboardthread.c
xorg-server/hw/xwin/winengine.c
xorg-server/hw/xwin/winwin32rootlesswindow.c
xorg-server/include/dixstruct.h
xorg-server/os/connection.c
Diffstat (limited to 'pixman/test/region-contains-test.c')
| -rw-r--r-- | pixman/test/region-contains-test.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pixman/test/region-contains-test.c b/pixman/test/region-contains-test.c index 2372686fc..9524e2888 100644 --- a/pixman/test/region-contains-test.c +++ b/pixman/test/region-contains-test.c @@ -73,7 +73,7 @@ random_coord (pixman_region32_t *region, pixman_bool_t x) case 3: return begin; default: - return (begin + end) / 2; + return (end - begin) / 2 + begin; } return 0; } @@ -163,7 +163,7 @@ main (int argc, const char *argv[]) { return fuzzer_test_main ("region_contains", 1000000, - 0xD7C297CC, + 0xD2BF8C73, test_region_contains_rectangle, argc, argv); } |