pixman: Branch 'master'

[Søren Sandmann Pedersen]

 pixman/pixman.c |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 0742ba41646853a5edf90c2f3102f49b248321ee
Author: Søren Sandmann Pedersen <ssp at redhat.com>
Date:   Tue Sep 21 10:05:52 2010 -0400

    compute_composite_region32: Zero extents before returning FALSE.
    
    If the extents of the composite region are broken such that x2 <= x1
    or y2 <= y1, then we need to zero the extents before returning so that
    the region won't be completely broken when calling
    pixman_region32_fini().

diff --git a/pixman/pixman.c b/pixman/pixman.c
index 2296325..bd9305b 100644
--- a/pixman/pixman.c
+++ b/pixman/pixman.c
@@ -306,6 +306,10 @@ pixman_compute_composite_region32 (pixman_region32_t * region,
     if (region->extents.x1 >= region->extents.x2 ||
         region->extents.y1 >= region->extents.y2)
     {
+	region->extents.x1 = 0;
+	region->extents.x2 = 0;
+	region->extents.y1 = 0;
+	region->extents.y2 = 0;
 	return FALSE;
     }