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

pdf: Use the helper functions to update the composite rectangles

Browse source 
These functions also know to update the clip and recompute the sample
areas and other derived information.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2011-09-18 08:25:11 +01:00
parent 6c6bd6fb29
commit e4ebee1cf4
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/cairo-pdf-surface.c
View file

@ -6104,6 +6104,8 @@ _cairo_pdf_surface_mask (void *abstract_surface,
cairo_pdf_smask_group_t *group; cairo_pdf_smask_group_t *group;
cairo_composite_rectangles_t extents; cairo_composite_rectangles_t extents;
cairo_int_status_t status; cairo_int_status_t status;
cairo_rectangle_int_t r;
cairo_box_t box;
status = _cairo_composite_rectangles_init_for_mask (&extents, status = _cairo_composite_rectangles_init_for_mask (&extents,
&surface->base, &surface->base,
@ -6141,18 +6143,25 @@ _cairo_pdf_surface_mask (void *abstract_surface,
assert (_cairo_pdf_surface_operation_supported (surface, op, mask, &extents.bounded)); assert (_cairo_pdf_surface_operation_supported (surface, op, mask, &extents.bounded));
/* get the accurate extents */ /* get the accurate extents */
status = _cairo_pattern_get_ink_extents (source, &extents.source); status = _cairo_pattern_get_ink_extents (source, &r);
if (unlikely (status)) if (unlikely (status))
goto cleanup; goto cleanup;
if (! _cairo_rectangle_intersect (&extents.bounded, &extents.source)) /* XXX slight impedance mismatch */
goto cleanup; _cairo_box_from_rectangle (&box, &r);
status = _cairo_composite_rectangles_intersect_source_extents (&extents,
status = _cairo_pattern_get_ink_extents (mask, &extents.mask); &box);
if (unlikely (status)) if (unlikely (status))
goto cleanup; goto cleanup;
if (! _cairo_rectangle_intersect (&extents.bounded, &extents.mask)) status = _cairo_pattern_get_ink_extents (mask, &r);
if (unlikely (status))
goto cleanup;
_cairo_box_from_rectangle (&box, &r);
status = _cairo_composite_rectangles_intersect_mask_extents (&extents,
&box);
if (unlikely (status))
goto cleanup; goto cleanup;
status = _cairo_pdf_surface_set_clip (surface, &extents); status = _cairo_pdf_surface_set_clip (surface, &extents);