summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSøren Sandmann Pedersen <ssp@l3000.localdomain>2010-11-11 16:03:08 -0500
committerSøren Sandmann Pedersen <ssp@l3000.localdomain>2010-11-11 16:03:08 -0500
commitc18522a625a5696e88c15a50a13ba0a6efb2355f (patch)
tree56eaa61b41dbda3b74e3094c4831eea331c85bc0
parent17f5ea24b8ba8c283ac79da1f222a33e95ebc887 (diff)
asdf
-rw-r--r--region-iter.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/region-iter.c b/region-iter.c
index a66cb79..b1a3503 100644
--- a/region-iter.c
+++ b/region-iter.c
@@ -77,11 +77,8 @@ next_power (size_t n)
}
static pixman_region32_data_t *
-region_data_append (pixman_region32_data_t *data, int n, pixman_box32_t *boxes)
+region_data_append (pixman_region32_data_t *data, int n)
{
- pixman_box32_t *data_boxes;
- size_t new_size;
-
if (!data || data->size < data->numRects + n)
{
size_t new_size = next_power (n + data? data->numRects : 0);
@@ -94,10 +91,6 @@ region_data_append (pixman_region32_data_t *data, int n, pixman_box32_t *boxes)
data->size = new_size;
}
- data_boxes = (pixman_box32_t *)(data + 1);
- while (n--)
- data_boxes[data->numRects++] = *boxes++;
-
return data;
}
@@ -124,6 +117,7 @@ region_builder_add_row (region_builder_t *builder,
while (box < end)
{
pixman_box32_t *next = box + 1;
+ pixman_box32_t *b;
if (next == end || next->x1 > box->x2)
{
@@ -141,7 +135,7 @@ region_builder_add_row (region_builder_t *builder,
b[n_rects].y1 = boxes->y1;
b[n_rects].y2 = boxes->y2;
b[n_rects].x1 = boxes->x1;
- n[n_rects].x2 = box->x2;
+ b[n_rects].x2 = box->x2;
data->numRects++;
boxes = next;