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

xcb: Make composite_opacity_boxes slightly less silly

Browse source 
Being called with no clip, might be unexpected, but it means to fill the
whole extents with the opacity. So do so.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2011-07-24 19:45:31 +01:00
parent 8dc9139fb2
commit f5d602cb59
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/cairo-xcb-surface-render.c
View file

@ -3322,7 +3322,10 @@ _composite_opacity_boxes (void *closure,
op = CAIRO_OPERATOR_SOURCE;
}
if (op == CAIRO_OPERATOR_SOURCE && clip == NULL)
if (op == CAIRO_OPERATOR_SOURCE &&
(clip == NULL ||
(clip->extents.width >= extents->width &&
clip->extents.height >= extents->height)))
dst->deferred_clear = FALSE;
if (dst->deferred_clear) {
@ -3348,6 +3351,13 @@ _composite_opacity_boxes (void *closure,
for (i = 0; i < clip->num_boxes; i++)
do_unaligned_box(composite_opacity, &info,
&clip->boxes[i], dst_x, dst_y);
} else {
composite_opacity(&info,
extents->x - dst_x,
extents->y - dst_y,
extents->width,
extents->height,
0xffff);
}
cairo_surface_destroy (&info.src->base);
@ -3438,7 +3448,8 @@ _cairo_xcb_surface_render_mask (cairo_xcb_surface_t *surface,
extents.clip->path == NULL &&
! _cairo_clip_is_region (extents.clip)) {
status = _clip_and_composite (surface, op, source,
_composite_opacity_boxes, NULL,
_composite_opacity_boxes,
_composite_opacity_boxes,
(void *) mask,
&extents, need_unbounded_clip (&extents));
} else {