diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-25 19:29:01 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-25 19:29:01 +0000 |
| commit | adc7f9a4ebdfe11d4cd6de9388b63dfe36450b39 (patch) | |
| tree | 23eb7becc5360b2cbe16aa8d45529880067f3989 /mi/miregion.c | |
| parent | 90f1536dd315cd265bfc7ef35058761a65a01734 (diff) | |
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folksxf86-4_3_99_16
Diffstat (limited to 'mi/miregion.c')
| -rw-r--r-- | mi/miregion.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/mi/miregion.c b/mi/miregion.c index 9a40e7757..ef666c321 100644 --- a/mi/miregion.c +++ b/mi/miregion.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/miregion.c,v 1.8 2001/12/14 20:00:26 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/miregion.c,v 1.10 2003/07/16 01:38:57 dawes Exp $ */ /*********************************************************** Copyright 1987, 1988, 1989, 1998 The Open Group @@ -70,7 +70,6 @@ SOFTWARE. * * *****************************************************************/ -#include "miscstruct.h" #include "regionstr.h" #include "Xprotostr.h" #include "gc.h" @@ -236,25 +235,27 @@ miPrintRegion(rgn) ErrorF("\n"); return(num); } - +#endif /* DEBUG */ Bool -miRegionsEqual(reg1, reg2) +miRegionEqual(reg1, reg2) RegionPtr reg1; RegionPtr reg2; { - int i; + int i, num; BoxPtr rects1, rects2; if (reg1->extents.x1 != reg2->extents.x1) return FALSE; if (reg1->extents.x2 != reg2->extents.x2) return FALSE; if (reg1->extents.y1 != reg2->extents.y1) return FALSE; if (reg1->extents.y2 != reg2->extents.y2) return FALSE; - if (REGION_NUM_RECTS(reg1) != REGION_NUM_RECTS(reg2)) return FALSE; + + num = REGION_NUM_RECTS(reg1); + if (num != REGION_NUM_RECTS(reg2)) return FALSE; rects1 = REGION_RECTS(reg1); rects2 = REGION_RECTS(reg2); - for (i = 0; i != REGION_NUM_RECTS(reg1); i++) { + for (i = 0; i != num; i++) { if (rects1[i].x1 != rects2[i].x1) return FALSE; if (rects1[i].x2 != rects2[i].x2) return FALSE; if (rects1[i].y1 != rects2[i].y1) return FALSE; @@ -263,6 +264,7 @@ miRegionsEqual(reg1, reg2) return TRUE; } +#ifdef DEBUG Bool miValidRegion(reg) RegionPtr reg; |