From df181620c0e6ca889013435d1ae5d0ffddfeec9d Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Thu, 14 Jul 2005 16:56:08 +0000 Subject: [PATCH] Eek. Yet _more_ fixups for _cairo_pattern_release_surface missed earlier. --- ChangeLog | 7 +++++++ src/cairo-xlib-surface.c | 8 ++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6b68dc82e..fd5fe48c4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-07-14 Carl Worth + + * src/cairo-xlib-surface.c: (_cairo_xlib_surface_composite), + (_cairo_xlib_surface_composite_trapezoids), + (_cairo_xlib_surface_show_glyphs): Eek. Yet _more_ fixups for + _cairo_pattern_release_surface missed earlier. + 2005-08-14 Stuart Parmenter * src/cairo-win32-surface.c: (_cairo_win32_surface_fill_rectangles): diff --git a/src/cairo-xlib-surface.c b/src/cairo-xlib-surface.c index 88f514dbe..95df4d298 100644 --- a/src/cairo-xlib-surface.c +++ b/src/cairo-xlib-surface.c @@ -1068,9 +1068,9 @@ _cairo_xlib_surface_composite (cairo_operator_t operator, FAIL: if (mask) - _cairo_pattern_release_surface (&dst->base, &mask->base, &mask_attr); + _cairo_pattern_release_surface (mask_pattern, &mask->base, &mask_attr); - _cairo_pattern_release_surface (&dst->base, &src->base, &src_attr); + _cairo_pattern_release_surface (src_pattern, &src->base, &src_attr); return status; } @@ -1168,7 +1168,7 @@ _cairo_xlib_surface_composite_trapezoids (cairo_operator_t operator, (XTrapezoid *) traps, num_traps); FAIL: - _cairo_pattern_release_surface (&dst->base, &src->base, &attributes); + _cairo_pattern_release_surface (pattern, &src->base, &attributes); return status; } @@ -2045,7 +2045,7 @@ _cairo_xlib_surface_show_glyphs (cairo_scaled_font_t *scaled_font, free (entries); FAIL: - _cairo_pattern_release_surface (&self->base, &src->base, &attributes); + _cairo_pattern_release_surface (pattern, &src->base, &attributes); return status; }