summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSøren Sandmann Pedersen <ssp@redhat.com>2010-08-14 05:13:11 -0400
committerSøren Sandmann Pedersen <ssp@redhat.com>2010-08-14 05:13:11 -0400
commitb668a40f64df5a9e760678b39e323498e86ee15c (patch)
tree3a61c95404f0c7bdb2f16a9f20930300f100c532
parentcd4d20eff09f3367a5ec69481f27a06adb6bc630 (diff)
row type in segment init
-rw-r--r--region-iter.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/region-iter.c b/region-iter.c
index c3b78f1..730cf63 100644
--- a/region-iter.c
+++ b/region-iter.c
@@ -226,14 +226,12 @@ struct segment_iter_t
};
static void
-segment_iter_init (segment_iter_t *iter,
- const pixman_box32_t *row1_begin, const pixman_box32_t *row1_end,
- const pixman_box32_t *row2_begin, const pixman_box32_t *row2_end)
+segment_iter_init (segment_iter_t *iter, const row_t *row1, const row_t *row2)
{
- iter->p1 = row1_begin;
- iter->p2 = row2_begin;
- iter->row1_end = row1_end;
- iter->row2_end = row2_end;
+ iter->p1 = row1->first;
+ iter->p2 = row2->first;
+ iter->row1_end = row1->last;
+ iter->row2_end = row2->last;
iter->x1 = 0;
iter->x2 = 0;
@@ -360,7 +358,7 @@ region_op (pixman_region32_t *dst,
overlapped_iter_get_rows (&iter, &row1, &row2);
- segment_iter_init (&seg_iter, row1.first, row1.last, row2.first, row2.last);
+ segment_iter_init (&seg_iter, &row1, &row2);
while (segment_iter_get_segment (&seg_iter, &x1, &x2, &type))
{
if (op & (1 << type))