pixman: Branch 'master'

[Søren Sandmann Pedersen]

 test/alphamap.c |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 00fdb3d8e8d5c04d01c352315b6a8e2e2dfe53ae
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date:   Sun Oct 24 15:58:39 2010 +0100

    Plug another leak in alphamap test
    
    Even after commit e46be417cebac984a858da05e61d924889695c9e alphamap
    test is still leaking the alphamap pixmap, leading to mmap() failures
    on cygwin
    
    Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>

diff --git a/test/alphamap.c b/test/alphamap.c
index 6013e63..9fb8969 100644
--- a/test/alphamap.c
+++ b/test/alphamap.c
@@ -82,6 +82,7 @@ create_image (pixman_format_code_t format, pixman_format_code_t alpha_format,
 
 	pixman_image_set_alpha_map (image, alpha,
 				    alpha_origin_x, alpha_origin_y);
+	pixman_image_unref (alpha);
     }
 
     return image;
@@ -217,6 +218,10 @@ run_test (int s, int d, int sa, int da, int soff, int doff)
 	}
     }
 
+    pixman_image_set_alpha_map (src, NULL, 0, 0);
+    pixman_image_set_alpha_map (dst, NULL, 0, 0);
+    pixman_image_set_alpha_map (orig_dst, NULL, 0, 0);
+
     pixman_image_unref (src);
     pixman_image_unref (dst);
     pixman_image_unref (orig_dst);