diff options
author | marha <marha@users.sourceforge.net> | 2013-11-07 08:23:50 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-11-07 08:23:50 +0100 |
commit | 51c3a4e7b08aa904ff2af52a9f6f7adc748b361f (patch) | |
tree | 38fa447dc8970b83becb4d35487d2bb2e565301b /pixman/test | |
parent | d79b6645eb21ca82d506ef038b8ea71a1e431f3f (diff) | |
parent | 31fd4c5654595a4763e492e4ec26f66ca3a8a405 (diff) | |
download | vcxsrv-51c3a4e7b08aa904ff2af52a9f6f7adc748b361f.tar.gz vcxsrv-51c3a4e7b08aa904ff2af52a9f6f7adc748b361f.tar.bz2 vcxsrv-51c3a4e7b08aa904ff2af52a9f6f7adc748b361f.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
libxtrans fontconfig mesa xserver pixman xkbcomp git update 4 nov 2013
Conflicts:
xorg-server/Xext/shm.c
xorg-server/os/xstrans.c
Diffstat (limited to 'pixman/test')
-rw-r--r-- | pixman/test/trap-crasher.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/pixman/test/trap-crasher.c b/pixman/test/trap-crasher.c index 4e4cac297..77be1c98b 100644 --- a/pixman/test/trap-crasher.c +++ b/pixman/test/trap-crasher.c @@ -5,7 +5,7 @@ int main() { pixman_image_t *dst; - pixman_trapezoid_t traps[1] = { + pixman_trapezoid_t traps[] = { { 2147483646, 2147483647, @@ -18,6 +18,18 @@ main() { 0, 2147483647 } } }, + { + 32768, + - 2147483647, + { + { 0, 0 }, + { 0, 2147483647 } + }, + { + { 65536, 0 }, + { 0, 2147483647 } + } + }, }; dst = pixman_image_create_bits (PIXMAN_a8, 1, 1, NULL, -1); |