fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-03-05 20:30:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: fixed code duplication

Browse source 
We have two places where copying from box set to clip is
implemented in the same way. Just move that to one function.

Signed-off-by: Enrico Weigelt, metux IT consult <enrico.weigelt@gr13.net>
Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Enrico Weigelt, metux IT consult 2016-06-30 17:45:45 +02:00 • committed by Uli Schlachter
parent 5bb43c92b3
commit f212db2fcc
1 changed files with 34 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
src/cairo-clip-boxes.c
View file

@ -264,6 +264,35 @@ _cairo_clip_intersect_box (cairo_clip_t *clip,
return _cairo_clip_intersect_rectangle_box (clip, &r, box);
}
/**
* copy a box set to an clip
*
* @param box the box set to copy from
* @param clip the clip to copy to (return buffer)
* @result zero if the allocation failed - the clip will be set to all-clipped
* otherwise non-zero
*/
static cairo_bool_t
_cairo_boxes_copy_to_clip (const cairo_boxes_t *boxes, cairo_clip_t *clip)
{
/* XXX cow-boxes? */
if (boxes->num_boxes == 1) {
clip->boxes = &clip->embedded_box;
clip->boxes[0] = boxes->chunks.base[0];
clip->num_boxes = 1;
return TRUE;
}
clip->boxes = _cairo_boxes_to_array (boxes, &clip->num_boxes);
if (unlikely (clip->boxes == NULL))
{
_cairo_clip_set_all_clipped (clip);
return FALSE;
}
return TRUE;
}
cairo_clip_t *
_cairo_clip_intersect_boxes (cairo_clip_t *clip,
const cairo_boxes_t *boxes)
@ -301,13 +330,10 @@ _cairo_clip_intersect_boxes (cairo_clip_t *clip,
if (boxes->num_boxes == 0) {
clip = _cairo_clip_set_all_clipped (clip);
goto out;
} else if (boxes->num_boxes == 1) {
clip->boxes = &clip->embedded_box;
clip->boxes[0] = boxes->chunks.base[0];
clip->num_boxes = 1;
} else {
clip->boxes = _cairo_boxes_to_array (boxes, &clip->num_boxes);
}
_cairo_boxes_copy_to_clip (boxes, clip);
_cairo_boxes_extents (boxes, &limits);
_cairo_box_round_to_rectangle (&limits, &extents);
@ -574,16 +600,8 @@ _cairo_clip_from_boxes (const cairo_boxes_t *boxes)
if (clip == NULL)
return _cairo_clip_set_all_clipped (clip);
/* XXX cow-boxes? */
if(boxes->num_boxes == 1) {
clip->boxes = &clip->embedded_box;
clip->boxes[0] = boxes->chunks.base[0];
clip->num_boxes = 1;
} else {
clip->boxes = _cairo_boxes_to_array (boxes, &clip->num_boxes);
if (clip->boxes == NULL)
return _cairo_clip_set_all_clipped (clip);
}
if (unlikely (! _cairo_boxes_copy_to_clip (boxes, clip)))
return clip;
_cairo_boxes_extents (boxes, &extents);
_cairo_box_round_to_rectangle (&extents, &clip->extents);