[cairo-commit] 2 commits - src/cairo-image-surface.c src/cairo-xcb-surface-render.c

[Chris Wilson]

 src/cairo-image-surface.c      |    4 +++-
 src/cairo-xcb-surface-render.c |    7 ++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 0d93468efc7f7337b63c0cd746d5185e14d345f1
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Oct 15 10:37:25 2010 +0100

    xcb: Pass clip to composite_glyphs_via_mask
    
    Spotted by Uli Schlachter.
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/cairo-xcb-surface-render.c b/src/cairo-xcb-surface-render.c
index 54839d5..8a6aa28 100644
--- a/src/cairo-xcb-surface-render.c
+++ b/src/cairo-xcb-surface-render.c
@@ -4665,8 +4665,7 @@ _cairo_xcb_surface_render_glyphs (cairo_xcb_surface_t	*surface,
 	status =
 	    _cairo_xcb_surface_render_glyphs_via_mask (surface, op, source,
 						       scaled_font, glyphs, num_glyphs,
-						       have_clip ? &local_clip : NULL,
-						       &extents);
+						       clip, &extents);
     }
 
     if (have_clip)
commit 42ecc427f361bcce68d529ae308ab65ff14ecea8
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Oct 15 10:28:32 2010 +0100

    xcb,image: Fix a missing clip fini
    
    Spotted by Uli Schlachter when I copied the image glyphs clipping to
    xcb.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/cairo-image-surface.c b/src/cairo-image-surface.c
index 491859f..5b2c063 100644
--- a/src/cairo-image-surface.c
+++ b/src/cairo-image-surface.c
@@ -4043,8 +4043,10 @@ _cairo_image_surface_glyphs (void			*abstract_surface,
     if (clip != NULL && extents.is_bounded) {
 	clip = _cairo_clip_init_copy (&local_clip, clip);
 	status = _cairo_clip_rectangle (clip, &extents.bounded);
-	if (unlikely (status))
+	if (unlikely (status)) {
+	    _cairo_clip_fini (&local_clip);
 	    return status;
+	}
 
 	have_clip = TRUE;
     }
diff --git a/src/cairo-xcb-surface-render.c b/src/cairo-xcb-surface-render.c
index 208d940..54839d5 100644
--- a/src/cairo-xcb-surface-render.c
+++ b/src/cairo-xcb-surface-render.c
@@ -4628,8 +4628,10 @@ _cairo_xcb_surface_render_glyphs (cairo_xcb_surface_t	*surface,
     if (clip != NULL && extents.is_bounded) {
 	clip = _cairo_clip_init_copy (&local_clip, clip);
 	status = _cairo_clip_rectangle (clip, &extents.bounded);
-	if (unlikely (status))
+	if (unlikely (status)) {
+	    _cairo_clip_fini (&local_clip);
 	    return status;
+	}
 
 	have_clip = TRUE;
     }