pixman: Branch 'master'
Matthias Hopf
mhopf at kemper.freedesktop.org
Wed Mar 24 10:56:47 PDT 2010
pixman/pixman-region.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
New commits:
commit efd41c62875d97c5127233cb6a4c353b4d495531
Author: Matthias Hopf <mhopf at suse.de>
Date: Wed Mar 24 18:54:29 2010 +0100
Revert "Improve PIXREGION_NIL to return true on degenerated regions."
This reverts commit ebba1493136a5a0dd7667073165b2115de203eda.
Scheduled for re-discussion after stable 0.18 has been released.
diff --git a/pixman/pixman-region.c b/pixman/pixman-region.c
index 179241d..a6a4005 100644
--- a/pixman/pixman-region.c
+++ b/pixman/pixman-region.c
@@ -69,11 +69,7 @@
#include <stdio.h>
#include "pixman-private.h"
-#define PIXREGION_NIL(reg) (((reg)->data && !(reg)->data->numRects) || \
- (! (reg)->data && \
- (reg)->extents.x1 == (reg)->extents.x2 && \
- (reg)->extents.y1 == (reg)->extents.y2))
-
+#define PIXREGION_NIL(reg) ((reg)->data && !(reg)->data->numRects)
/* not a region */
#define PIXREGION_NAR(reg) ((reg)->data == pixman_broken_data)
#define PIXREGION_NUMRECTS(reg) ((reg)->data ? (reg)->data->numRects : 1)
More information about the xorg-commit
mailing list