diff options
Diffstat (limited to 'test/operator-clear.c')
-rw-r--r-- | test/operator-clear.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/test/operator-clear.c b/test/operator-clear.c index e6cb042a7..f1eb32248 100644 --- a/test/operator-clear.c +++ b/test/operator-clear.c @@ -128,12 +128,12 @@ draw_rects (cairo_t *cr, int x, int y) cairo_fill (cr); } -static void (*pattern_funcs[])(cairo_t *cr, int x, int y) = { +static void (* const pattern_funcs[])(cairo_t *cr, int x, int y) = { set_solid_pattern, set_gradient_pattern, }; -static void (*draw_funcs[])(cairo_t *cr, int x, int y) = { +static void (* const draw_funcs[])(cairo_t *cr, int x, int y) = { draw_mask, draw_glyphs, draw_polygon, @@ -146,7 +146,7 @@ static void (*draw_funcs[])(cairo_t *cr, int x, int y) = { static cairo_test_draw_function_t draw; -cairo_test_t test = { +static const cairo_test_t test = { "operator-clear", "Test of CAIRO_OPERATOR_CLEAR", IMAGE_WIDTH, IMAGE_HEIGHT, @@ -156,6 +156,7 @@ cairo_test_t test = { static cairo_test_status_t draw (cairo_t *cr, int width, int height) { + const cairo_test_context_t *ctx = cairo_test_get_context (cr); size_t i, j, x, y; cairo_pattern_t *pattern; @@ -187,14 +188,14 @@ draw (cairo_t *cr, int width, int height) pattern_funcs[i] (cr, x, y); draw_funcs[j] (cr, x, y); if (cairo_status (cr)) - cairo_test_log ("%d %d HERE!\n", (int)i, (int)j); + cairo_test_log (ctx, "%d %d HERE!\n", (int)i, (int)j); cairo_restore (cr); } } if (cairo_status (cr) != CAIRO_STATUS_SUCCESS) - cairo_test_log ("%d %d .HERE!\n", (int)i, (int)j); + cairo_test_log (ctx, "%d %d .HERE!\n", (int)i, (int)j); return CAIRO_TEST_SUCCESS; } |