diff --git a/pixman/ChangeLog.libpixregion b/pixman/ChangeLog.libpixregion index e69de29bb..746a8a8c5 100644 --- a/pixman/ChangeLog.libpixregion +++ b/pixman/ChangeLog.libpixregion @@ -0,0 +1,9 @@ +2003-02-25 Carl Worth + + * src/pixregion.c (PixRegionCreateSimple): Eliminated useless size + parameter from PixRegionCreateSized, (the server only ever calls + it with a value of 1 or 0). + (PixRegionInit): + (PixRegionUninit): + (PixRegionBreak): Changed these three functions to be static. + diff --git a/pixman/src/pixman.h b/pixman/src/pixman.h index 8eae9f9dd..6a6bae5a7 100644 --- a/pixman/src/pixman.h +++ b/pixman/src/pixman.h @@ -67,7 +67,7 @@ PixRegion * PixRegionCreate (void); PixRegion * -PixRegionCreateSized (PixRegionBox *extents_or_null, int size); +PixRegionCreateSimple (PixRegionBox *extents); void PixRegionDestroy (PixRegion *region); @@ -75,7 +75,7 @@ PixRegionDestroy (PixRegion *region); /* manipulation */ void -PixRegionTranslate (PixRegion *pReg, int x, int y); +PixRegionTranslate (PixRegion *region, int x, int y); PixRegionStatus PixRegionCopy (PixRegion *dest, PixRegion *source); @@ -116,16 +116,16 @@ PixRegionRects (PixRegion *region); #define rgnPART 2 int -PixRegionPointInRegion (PixRegion *pReg, int x, int y, PixRegionBox *box); +PixRegionPointInRegion (PixRegion *region, int x, int y, PixRegionBox *box); int PixRegionRectIn (PixRegion *PixRegion, PixRegionBox *prect); int -PixRegionNotEmpty (PixRegion *pReg); +PixRegionNotEmpty (PixRegion *region); PixRegionBox * -PixRegionExtents (PixRegion *pReg); +PixRegionExtents (PixRegion *region); /* mucking around */ @@ -137,21 +137,14 @@ PixRegionAppend (PixRegion *dest, PixRegion *region); PixRegionStatus PixRegionValidate (PixRegion *badreg, int *pOverlap); -/* Unclassified functionality */ +/* Unclassified functionality + * XXX: Do all of these need to be exported? + */ void -PixRegionReset (PixRegion *pReg, PixRegionBox *pBox); - -PixRegionStatus -PixRegionBreak (PixRegion *pReg); +PixRegionReset (PixRegion *region, PixRegionBox *pBox); void -PixRegionInit (PixRegion *region, PixRegionBox *rect, int size); - -void -PixRegionUninit (PixRegion *region); - -void -PixRegionEmpty (PixRegion *pReg); +PixRegionEmpty (PixRegion *region); #endif /* PIXREGION_H */ diff --git a/pixman/src/pixregion.c b/pixman/src/pixregion.c index 534e651cf..24bbd5f0d 100644 --- a/pixman/src/pixregion.c +++ b/pixman/src/pixregion.c @@ -78,6 +78,15 @@ static PixRegionData PixRegionEmptyData = {0, 0}; static PixRegionData PixRegionBrokenData = {0, 0}; static PixRegion PixRegionBrokenRegion = { { 0, 0, 0, 0 }, &PixRegionBrokenData }; +static PixRegionStatus +PixRegionBreak (PixRegion *pReg); + +static void +PixRegionInit (PixRegion *region, PixRegionBox *rect); + +static void +PixRegionUninit (PixRegion *region); + /* * The functions in this file implement the Region abstraction used extensively * throughout the X11 sample server. A Region is simply a set of disjoint @@ -295,16 +304,16 @@ PixRegionValidRegion(reg) PixRegion * PixRegionCreate (void) { - return PixRegionCreateSized (NULL, 1); + return PixRegionCreateSimple (NULL); } /***************************************************************** - * PixRegionCreate(rect, size) - * This routine does a simple malloc to make a structure of - * REGION of "size" number of rectangles. + * PixRegionCreateSimple (extents) + * This routine creates a PixRegion for a simple + * rectangular region. *****************************************************************/ PixRegion * -PixRegionCreateSized (PixRegionBox *extents_or_null, int size) +PixRegionCreateSimple (PixRegionBox *extents) { PixRegion *region; @@ -312,7 +321,7 @@ PixRegionCreateSized (PixRegionBox *extents_or_null, int size) if (region == NULL) return &PixRegionBrokenRegion; - PixRegionInit (region, extents_or_null, size); + PixRegionInit (region, extents); return region; } @@ -322,30 +331,22 @@ PixRegionCreateSized (PixRegionBox *extents_or_null, int size) * Outer region rect is statically allocated. *****************************************************************/ -/* XXX: What's the point of accepting extents when it is guaranteed to be wrong, - since the region will start out covering no area? */ -void -PixRegionInit(PixRegion *region, PixRegionBox *extents_or_null, int size) +static void +PixRegionInit(PixRegion *region, PixRegionBox *extents) { - if (extents_or_null) + if (extents) { - region->extents = *extents_or_null; + region->extents = *extents; region->data = NULL; } else { region->extents = PixRegionEmptyBox; - if ((size > 1) && (region->data = allocData (size))) - { - region->data->size = size; - region->data->numRects = 0; - } - else - region->data = &PixRegionEmptyData; + region->data = &PixRegionEmptyData; } } -void +static void PixRegionUninit (PixRegion *region) { good (region); @@ -373,7 +374,7 @@ PixRegionRects (PixRegion *region) return PIXREGION_RECTS (region); } -PixRegionStatus +static PixRegionStatus PixRegionBreak (PixRegion *region) { freeData (region);