Export pixman_region_reset

diff --git a/pixman/pixman-region.c b/pixman/pixman-region.c
index da7e4bd..8d0b06b 100644 (file)
--- a/pixman/pixman-region.c
+++ b/pixman/pixman-region.c
@@ -79,7 +79,7 @@ typedef struct pixman_region16_point {
 #define assert(expr)
 #endif
 
-#define good(reg) assert(pixman_region16_valid(reg))
+#define good(reg) assert(pixman_region_selfcheck(reg))
 
 #undef MIN
 #define MIN(a,b) ((a) < (b) ? (a) : (b))
@@ -1596,89 +1596,6 @@ bail:
     return pixman_break (badreg);
 }
 
-/* XXX: Need to fix this to not use any X data structure
-pixman_region16_t *
-pixman_region_rectsToRegion(nrects, prect, ctype)
-    int                        nrects;
-    xRectangle *prect;
-    int                        ctype;
-{
-    pixman_region16_t *        region;
-    pixman_region16_data_t *   pData;
-    pixman_box16_t *   box;
-    int        i;
-    int                        x1, y1, x2, y2;
-
-    region = pixman_region_create(NullBox, 0);
-    if (PIXREGION_NAR (region))
-       return region;
-    if (!nrects)
-       return region;
-    if (nrects == 1)
-    {
-       x1 = prect->x;
-       y1 = prect->y;
-       if ((x2 = x1 + (int) prect->width) > SHRT_MAX)
-           x2 = SHRT_MAX;
-       if ((y2 = y1 + (int) prect->height) > SHRT_MAX)
-           y2 = SHRT_MAX;
-       if (x1 != x2 && y1 != y2)
-       {
-           region->extents.x1 = x1;
-           region->extents.y1 = y1;
-           region->extents.x2 = x2;
-           region->extents.y2 = y2;
-           region->data = (pixman_region16_data_t *)NULL;
-       }
-       return region;
-    }
-    pData = allocData(nrects);
-    if (!pData)
-    {
-       pixman_break (region);
-       return region;
-    }
-    box = (pixman_box16_t *) (pData + 1);
-    for (i = nrects; --i >= 0; prect++)
-    {
-       x1 = prect->x;
-       y1 = prect->y;
-       if ((x2 = x1 + (int) prect->width) > SHRT_MAX)
-           x2 = SHRT_MAX;
-       if ((y2 = y1 + (int) prect->height) > SHRT_MAX)
-           y2 = SHRT_MAX;
-       if (x1 != x2 && y1 != y2)
-       {
-           box->x1 = x1;
-           box->y1 = y1;
-           box->x2 = x2;
-           box->y2 = y2;
-           box++;
-       }
-    }
-    if (box != (pixman_box16_t *) (pData + 1))
-    {
-       pData->size = nrects;
-       pData->numRects = box - (pixman_box16_t *) (pData + 1);
-       region->data = pData;
-       if (ctype != CT_YXBANDED)
-       {
-           int overlap;
-           region->extents.x1 = region->extents.x2 = 0;
-           pixman_region_validate(region, &overlap);
-       }
-       else
-           pixman_set_extents(region);
-       good(region);
-    }
-    else
-    {
-       free (pData);
-    }
-    return region;
-}
-*/
-
 /*======================================================================
  *               Region Subtraction
  *====================================================================*/

diff --git a/pixman/pixman.h b/pixman/pixman.h
index 5375ebe..5159c4b 100644 (file)
--- a/pixman/pixman.h
+++ b/pixman/pixman.h
@@ -210,6 +210,7 @@ typedef enum
  */
 typedef struct pixman_region16_data    pixman_region16_data_t;
 typedef struct pixman_box16            pixman_box16_t;
+typedef struct pixman_rectangle16      pixman_rectangle16_t;
 typedef struct pixman_region16         pixman_region16_t;
 
 struct pixman_region16_data {
@@ -218,6 +219,12 @@ struct pixman_region16_data {
 /*  pixman_box16_t     rects[size];   in memory but not explicitly declared */
 };
 
+struct pixman_rectangle16
+{
+    int16_t x, y;
+    uint16_t width, height;
+};
+
 struct pixman_box16
 {
     int16_t x1, y1, x2, y2;
@@ -288,6 +295,7 @@ const pixman_box16_t *  pixman_region_rectangles (pixman_region16_t *region,
 pixman_bool_t          pixman_region_equal (pixman_region16_t *region1,
                                             pixman_region16_t *region2);
 pixman_bool_t          pixman_region_selfcheck (pixman_region16_t *region);
+void                   pixman_region_reset(pixman_region16_t *region, pixman_box16_t *box);
 
 /*
  * Images