pixman: Branch 'master'

[Matthias Hopf]

 pixman/pixman-region.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit ebba1493136a5a0dd7667073165b2115de203eda
Author: Matthias Hopf <mhopf at suse.de>
Date:   Wed Mar 24 12:00:21 2010 +0100

    Improve PIXREGION_NIL to return true on degenerated regions.
    
    Fixes Novell bug 568811.

diff --git a/pixman/pixman-region.c b/pixman/pixman-region.c
index a6a4005..179241d 100644
--- a/pixman/pixman-region.c
+++ b/pixman/pixman-region.c
@@ -69,7 +69,11 @@
 #include <stdio.h>
 #include "pixman-private.h"
 
-#define PIXREGION_NIL(reg) ((reg)->data && !(reg)->data->numRects)
+#define PIXREGION_NIL(reg) (((reg)->data && !(reg)->data->numRects) ||	\
+			    (! (reg)->data &&				\
+			     (reg)->extents.x1 == (reg)->extents.x2 &&	\
+			     (reg)->extents.y1 == (reg)->extents.y2))
+
 /* not a region */
 #define PIXREGION_NAR(reg)      ((reg)->data == pixman_broken_data)
 #define PIXREGION_NUMRECTS(reg) ((reg)->data ? (reg)->data->numRects : 1)