pixman: Branch 'master'

[Søren Sandmann Pedersen]

 test/window-test.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 69f1ec9a7827aeb522fcae99846237ef0f896e7b
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date:   Wed Mar 17 21:07:06 2010 +0000

    Avoid a potential division-by-zero exeception in window-test
    
    Avoid a division-by-zero exception if the first number returned by
    rand() is a multiple of 500, causing us to create a zero width pixmap,
    and then attempt to use get_rand(0) when generating a random stride...
    
    Fixes https://bugs.freedesktop.org/attachment.cgi?id=34162

diff --git a/test/window-test.c b/test/window-test.c
index 084e23a..919fc16 100644
--- a/test/window-test.c
+++ b/test/window-test.c
@@ -137,8 +137,8 @@ main ()
     pixman_image_t *src, *dest;
     int src_x, src_y, dest_x, dest_y;
     int i, j;
-    int width = get_rand (500);
-    int height = get_rand (500);
+    int width = get_rand (499) + 1;
+    int height = get_rand (499) + 1;
 
     src = make_image (width, height, TRUE, &src_x, &src_y);
     dest = make_image (width, height, FALSE, &dest_x, &dest_y);