From 30f0d517aa73d5d00b5a2bed2f549f9c662a39a7 Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Fri, 8 Apr 2005 10:03:17 +0000 Subject: Eliminate internal use of deprecated cairo_matrix_copy. Change cairo_get_matrix to accept a pointer to the return value cairo_matrix_t rather than returning the value directly. --- src/cairo.c | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) (limited to 'src/cairo.c') diff --git a/src/cairo.c b/src/cairo.c index f59a6276..f8062f57 100644 --- a/src/cairo.c +++ b/src/cairo.c @@ -2046,39 +2046,20 @@ cairo_get_miter_limit (cairo_t *cr) } DEPRECATE (cairo_current_miter_limit, cairo_get_miter_limit); -/** - * cairo_get_matrix: - * @cr: a cairo context - * - * Gets the current transformation matrix (CTM), a matrix which - * transforms from user space to device space. - * - * Return value: the current transformation matrix. - **/ -cairo_matrix_t -cairo_get_matrix (cairo_t *cr) -{ - CAIRO_CHECK_SANITY (cr); - return _cairo_gstate_get_matrix (cr->gstate); -} - /** * cairo_get_matrix: * @cr: a cairo context * @matrix: return value for the matrix - * - * Stores the current transformation matrix (CTM) into @matrix. * - * WARNING: This function is deprecated and will be disappearing - * shortly. + * Stores the current transformation matrix (CTM) into @matrix. **/ void -cairo_current_matrix (cairo_t *cr, cairo_matrix_t *matrix) +cairo_get_matrix (cairo_t *cr, cairo_matrix_t *matrix) { CAIRO_CHECK_SANITY (cr); - _cairo_gstate_current_matrix (cr->gstate, matrix); - CAIRO_CHECK_SANITY (cr); + _cairo_gstate_get_matrix (cr->gstate, matrix); } +DEPRECATE(cairo_current_matrix, cairo_get_matrix); /** * cairo_get_target_surface: -- cgit v1.2.3