fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-05-05 19:18:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

clip: Fix boxes extents computation in intersect_with_boxes

Browse source 
The extents of the boxes were being computed by taking into account
just the first box instead of all of them.

Based on a patch by James Cloos.

Fixes clip-disjoint, clip-stroke-unbounded, clip-fill-nz-unbounded,
clip-fill-eo-unbounded, clip-fill, clip-stroke, trap-clip.

See https://bugs.freedesktop.org/show_bug.cgi?id=38641

Reviewed-by: James Cloos <cloos@jhcloos.com>
Tested-by: James Cloos <cloos@jhcloos.com>
This commit is contained in:
Andrea Canciani 2011-06-24 15:52:24 +02:00
parent 1a4e9f1e91
commit a447e94979
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/cairo-clip.c
View file

@ -1398,20 +1398,22 @@ intersect_with_boxes (cairo_composite_rectangles_t *extents,
{
cairo_rectangle_int_t rect;
cairo_box_t box;
int i;
assert (num_boxes > 0);
/* Find the extents over all the clip boxes */
box.p1.x = box.p1.y = INT_MAX;
box.p2.x = box.p2.y = INT_MIN;
while (num_boxes--) {
if (boxes->p1.x < box.p1.x)
box.p1.x = boxes->p1.x;
if (boxes->p1.y < box.p1.y)
box.p1.y = boxes->p1.y;
box = boxes[0];
for (i = 1; i < num_boxes; i++) {
if (boxes[i].p1.x < box.p1.x)
box.p1.x = boxes[i].p1.x;
if (boxes[i].p1.y < box.p1.y)
box.p1.y = boxes[i].p1.y;
if (boxes->p2.x > box.p2.x)
box.p2.x = boxes->p2.x;
if (boxes->p2.y > box.p2.y)
box.p2.y = boxes->p2.y;
if (boxes[i].p2.x > box.p2.x)
box.p2.x = boxes[i].p2.x;
if (boxes[i].p2.y > box.p2.y)
box.p2.y = boxes[i].p2.y;
}
_cairo_box_round_to_rectangle (&box, &rect);