From a56d4530d6149e2c4fc884a5cfeede2d6ff6d3b6 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Fri, 17 Oct 2008 15:54:21 +0100 Subject: [PATCH] [test/smask-text] Propagate error. Use cairo_get_target() to propagate error from the secondary context. --- test/smask-text.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/smask-text.c b/test/smask-text.c index 822ea5af4..49eb6060e 100644 --- a/test/smask-text.c +++ b/test/smask-text.c @@ -42,10 +42,14 @@ draw (cairo_t *cr, int width, int height) cairo_t *cr2; cairo_text_extents_t extents; + cairo_set_source_rgb (cr, 0, 0, 1.0); + cairo_paint (cr); + mask = cairo_surface_create_similar (cairo_get_group_target (cr), CAIRO_CONTENT_ALPHA, width, height); cr2 = cairo_create (mask); + cairo_surface_destroy (mask); cairo_save (cr2); { cairo_set_operator (cr2, CAIRO_OPERATOR_CLEAR); @@ -72,14 +76,10 @@ draw (cairo_t *cr, int width, int height) floor ((width - extents.width) / 2 + 0.5) - extents.x_bearing, floor ((height - extents.height) / 2 - 0.5) - extents.y_bearing); cairo_show_text (cr2, "cairo"); - cairo_destroy (cr2); - - cairo_set_source_rgb (cr, 0, 0, 1.0); - cairo_paint (cr); cairo_set_source_rgb (cr, 1.0, 0, 0); - cairo_mask_surface (cr, mask, 0, 0); - cairo_surface_destroy (mask); + cairo_mask_surface (cr, cairo_get_target (cr2), 0, 0); + cairo_destroy (cr2); return CAIRO_TEST_SUCCESS; }