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/blitters-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/blitters-test.c')
| -rw-r--r-- | pixman/test/blitters-test.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pixman/test/blitters-test.c b/pixman/test/blitters-test.c index 55b6c735c..feea308c2 100644 --- a/pixman/test/blitters-test.c +++ b/pixman/test/blitters-test.c @@ -103,7 +103,7 @@ free_random_image (uint32_t initcrc, mask <<= (PIXMAN_FORMAT_BPP (fmt) - PIXMAN_FORMAT_DEPTH (fmt)); } - for (i = 0; i < 32; i++) + for (i = 0; i * PIXMAN_FORMAT_BPP (fmt) < 32; i++) mask |= mask << (i * PIXMAN_FORMAT_BPP (fmt)); for (i = 0; i < stride * height / 4; i++) @@ -424,6 +424,6 @@ main (int argc, const char *argv[]) } return fuzzer_test_main("blitters", 2000000, - 0x29137844, + 0xA364B5BF, test_composite, argc, argv); } |