summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSøren Sandmann Pedersen <ssp@redhat.com>2010-11-10 14:48:39 -0500
committerSøren Sandmann Pedersen <ssp@redhat.com>2010-11-10 14:48:39 -0500
commit4277dca05c442e6798c4a5029c4c1587b3c35d5e (patch)
treeb1b048c97f619ae6846a9e38b34e1bb76a7b5c11
parente6029a6270402ee4240c75aa509c4855d16b7c36 (diff)
builder
-rw-r--r--region-iter.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/region-iter.c b/region-iter.c
index 90f8ead..cf64ec2 100644
--- a/region-iter.c
+++ b/region-iter.c
@@ -107,7 +107,8 @@ region_builder_init (region_builder_t *builder)
}
static pixman_bool_t
-region_builder_add_boxes (region_builder_t *builder, int n, pixman_box32_t *boxes)
+region_builder_add_boxes (region_builder_t *builder,
+ int n, pixman_box32_t *boxes)
{
pixman_region32_data_t *data;
@@ -127,14 +128,15 @@ region_builder_add_boxes (region_builder_t *builder, int n, pixman_box32_t *boxe
return TRUE;
}
-static void
+static pixman_bool_t
region_builder_finish (region_builder_t *builder, pixman_region32_t *region)
{
pixman_region32_fini (region);
if (!builder->data)
{
- /* Empty */
+ pixman_region32_init (region);
+ return TRUE;
}
else if (builder->data == BROKEN_DATA)
{
@@ -476,7 +478,8 @@ compare_boxes (const void *box1v, const void *box2v)
}
static pixman_bool_t
-make_region_from_sorted (pixman_region32_t *region, pixman_box32_t *boxes, int n_boxes)
+make_region_from_sorted (pixman_region32_t *region,
+ const pixman_box32_t *boxes, int n_boxes)
{
if (n_boxes == 1)
{
@@ -512,7 +515,8 @@ make_region_from_sorted (pixman_region32_t *region, pixman_box32_t *boxes, int n
}
pixman_bool_t
-region_from_boxes (pixman_region32_t *region, const pixman_box32_t *boxes, int n_boxes)
+region_from_boxes (pixman_region32_t *region,
+ const pixman_box32_t *boxes, int n_boxes)
{
if (n_boxes == 0)
{