diff options
| author | Alexander Larsson <alexl@redhat.com> | 2013-08-27 14:46:16 +0200 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2013-09-05 16:11:09 +0100 |
| commit | bc792a5e0e196dd9761649b14c9206465b42ef1d (patch) | |
| tree | 78ffa8e991f1fed99a16fc06cce80bddb8d8a3b5 /src/cairo-mask-compositor.c | |
| parent | bdccf4fe51bca785f73205ccd26c4d020669e312 (diff) | |
| download | cairo-bc792a5e0e196dd9761649b14c9206465b42ef1d.tar.gz | |
surface: Merge scratch construction into _cairo_surface_create_scratch
We merge _cairo_surface_create_similar_scratch and
_cairo_surface_create_similar_solid into a single function named
_cairo_surface_create_scratch, to avoid confusion with
cairo_surface_create_similar which now will have a different
behaviour wrt the sizes and the device-scale.
_create_scratch assumes the width and height are in backend
coordinates, while create_similar does not.
Diffstat (limited to 'src/cairo-mask-compositor.c')
| -rw-r--r-- | src/cairo-mask-compositor.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/cairo-mask-compositor.c b/src/cairo-mask-compositor.c index d0be1449d..4d6b118dd 100644 --- a/src/cairo-mask-compositor.c +++ b/src/cairo-mask-compositor.c @@ -163,9 +163,10 @@ create_composite_mask (const cairo_mask_compositor_t *compositor, struct blt_in info; int i; - surface = _cairo_surface_create_similar_scratch (dst, CAIRO_CONTENT_ALPHA, - extents->bounded.width, - extents->bounded.height); + surface = _cairo_surface_create_scratch (dst, CAIRO_CONTENT_ALPHA, + extents->bounded.width, + extents->bounded.height, + NULL); if (unlikely (surface->status)) return surface; @@ -346,9 +347,10 @@ clip_and_composite_combine (const cairo_mask_compositor_t *compositor, cairo_status_t status; int clip_x, clip_y; - tmp = _cairo_surface_create_similar_scratch (dst, dst->content, - extents->bounded.width, - extents->bounded.height); + tmp = _cairo_surface_create_scratch (dst, dst->content, + extents->bounded.width, + extents->bounded.height, + NULL); if (unlikely (tmp->status)) return tmp->status; |