fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-05-05 20:28:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Eliminate internal use of deprecated cairo_matrix_copy.

Browse source 
Change cairo_get_matrix to accept a pointer to the return value cairo_matrix_t rather than returning the value directly.
This commit is contained in:
Carl Worth 2005-04-08 10:03:17 +00:00
parent 745627ff1b
commit 30f0d517aa
6 changed files with 28 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ChangeLog
View file

@ -1,3 +1,18 @@
2005-04-08 Carl Worth <cworth@cworth.org>
* src/cairo-gstate.c:
(_cairo_gstate_transform), (_cairo_gstate_set_matrix),
(_cairo_gstate_interpret_path): Eliminate internal use of
deprecated cairo_matrix_copy.
* src/cairo-gstate.c: (_cairo_gstate_get_matrix),
* src/cairo-matrix.c: (cairo_matrix_copy):
* src/cairo.c: (cairo_get_matrix):
* src/cairo.h:
* src/cairoint.h: Change cairo_get_matrix to accept a pointer to
the return value cairo_matrix_t rather than returning the value
directly.
2005-04-08 Carl Worth <cworth@cworth.org>
* src/cairo-matrix.c (cairo_matrix_init_identity): Don't try to

18
src/cairo-gstate.c
View file

@ -561,16 +561,10 @@ _cairo_gstate_get_miter_limit (cairo_gstate_t *gstate)
return gstate->miter_limit;
}
cairo_matrix_t
_cairo_gstate_get_matrix (cairo_gstate_t *gstate)
{
return gstate->ctm;
}
void
_cairo_gstate_current_matrix (cairo_gstate_t *gstate, cairo_matrix_t *matrix)
_cairo_gstate_get_matrix (cairo_gstate_t *gstate, cairo_matrix_t *matrix)
{
cairo_matrix_copy (matrix, &gstate->ctm);
*matrix = gstate->ctm;
}
cairo_status_t
@ -631,7 +625,7 @@ _cairo_gstate_transform (cairo_gstate_t *gstate, cairo_matrix_t *matrix)
_cairo_gstate_unset_font (gstate);
cairo_matrix_copy (&tmp, matrix);
tmp = *matrix;
cairo_matrix_multiply (&gstate->ctm, &tmp, &gstate->ctm);
cairo_matrix_invert (&tmp);
@ -648,9 +642,9 @@ _cairo_gstate_set_matrix (cairo_gstate_t *gstate,
_cairo_gstate_unset_font (gstate);
cairo_matrix_copy (&gstate->ctm, matrix);
gstate->ctm = *matrix;
cairo_matrix_copy (&gstate->ctm_inverse, matrix);
gstate->ctm_inverse = *matrix;
status = cairo_matrix_invert (&gstate->ctm_inverse);
if (status)
return status;
@ -1280,7 +1274,7 @@ _cairo_gstate_interpret_path (cairo_gstate_t *gstate,
pointers into gstate. */
_cairo_path_fixed_init_copy (&path, &gstate->path);
cairo_matrix_copy (&gpi.ctm_inverse, &gstate->ctm_inverse);
gpi.ctm_inverse = gstate->ctm_inverse;
if (gstate->surface)
cairo_matrix_translate (&gpi.ctm_inverse,
- gstate->surface->device_x_offset,

1
src/cairo-matrix.c
View file

@ -106,7 +106,6 @@ cairo_matrix_copy (cairo_matrix_t *matrix, const cairo_matrix_t *other)
{
*matrix = *other;
}
slim_hidden_def(cairo_matrix_copy);
/**
* cairo_matrix_init_identity:

27
src/cairo.c
View file

@ -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:

7
src/cairo.h
View file

@ -699,12 +699,8 @@ cairo_get_miter_limit (cairo_t *cr);
/* XXX: How to do cairo_get_dash??? Do we want to switch to a cairo_dash object? */
cairo_matrix_t
cairo_get_matrix (cairo_t *cr);
/* XXX: cairo_current_matrix is deprecated in favor of cairo_get_matrix. */
void
cairo_current_matrix (cairo_t *cr, cairo_matrix_t *matrix);
cairo_get_matrix (cairo_t *cr, cairo_matrix_t *matrix);
/* XXX: Need to decide the memory management semantics of this
function. Should it reference the surface again? */
@ -1141,6 +1137,7 @@ typedef cairo_status_t (*cairo_write_func_t) (void *closure,
#define cairo_current_line_cap cairo_get_line_cap
#define cairo_current_line_join cairo_get_line_join
#define cairo_current_miter_limit cairo_get_miter_limit
#define cairo_current_matrix cairo_get_matrix
#define cairo_current_target_surface cairo_get_target_surface
#define cairo_get_font_extents cairo_font_extents
#define cairo_get_status cairo_status

5
src/cairoint.h
View file

@ -966,11 +966,8 @@ _cairo_gstate_set_miter_limit (cairo_gstate_t *gstate, double limit);
cairo_private double
_cairo_gstate_get_miter_limit (cairo_gstate_t *gstate);
cairo_private cairo_matrix_t
_cairo_gstate_get_matrix (cairo_gstate_t *gstate);
cairo_private void
_cairo_gstate_current_matrix (cairo_gstate_t *gstate, cairo_matrix_t *matrix);
_cairo_gstate_get_matrix (cairo_gstate_t *gstate, cairo_matrix_t *matrix);
cairo_private cairo_status_t
_cairo_gstate_translate (cairo_gstate_t *gstate, double tx, double ty);