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

Fix cairo_get_font_matrix to actually use its out-parameter. And change the return type to void.

Browse source
This commit is contained in:
Carl Worth 2005-05-10 12:22:41 +00:00
parent 7b46c815d2
commit c66ca528e0
5 changed files with 23 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2005-05-10 Carl Worth <cworth@cworth.org>
* src/cairo-gstate.c: (_cairo_gstate_get_font_matrix):
* src/cairo.c: (cairo_get_font_matrix):
* src/cairo.h:
* src/cairoint.h: Fix cairo_get_font_matrix to actually use its
out-parameter. And change the return type to void.
2005-05-09 Owen Taylor <otaylor@redhat.com>
* src/cairo-ft-font.c (_cairo_ft_unscaled_font_create_glyph):

7
src/cairo-gstate.c
View file

@ -1734,10 +1734,11 @@ _cairo_gstate_set_font_matrix (cairo_gstate_t *gstate,
return CAIRO_STATUS_SUCCESS;
}
cairo_matrix_t
_cairo_gstate_get_font_matrix (cairo_gstate_t *gstate)
void
_cairo_gstate_get_font_matrix (cairo_gstate_t *gstate,
cairo_matrix_t *matrix)
{
return gstate->font_matrix;
*matrix = gstate->font_matrix;
}
cairo_status_t

10
src/cairo.c
View file

@ -1653,16 +1653,16 @@ cairo_set_font_matrix (cairo_t *cr,
/**
* cairo_get_font_matrix
* @cr: a #cairo_t
* @matrix: return value for the matrix
*
* Gets the current font matrix. See cairo_set_font_matrix()
*
* Return value: the current font matrix
* Stores the current font matrix into @matrix. See
* cairo_set_font_matrix().
**/
cairo_matrix_t
void
cairo_get_font_matrix (cairo_t *cr, cairo_matrix_t *matrix)
{
CAIRO_CHECK_SANITY (cr);
return _cairo_gstate_get_font_matrix (cr->gstate);
_cairo_gstate_get_font_matrix (cr->gstate, matrix);
}
/**

5
src/cairo.h
View file

@ -655,8 +655,9 @@ void
cairo_set_font_matrix (cairo_t *cr,
const cairo_matrix_t *matrix);
cairo_matrix_t
cairo_get_font_matrix (cairo_t *cr, cairo_matrix_t *matrix);
void
cairo_get_font_matrix (cairo_t *cr,
cairo_matrix_t *matrix);
void
cairo_show_text (cairo_t *cr, const char *utf8);

5
src/cairoint.h
View file

@ -1122,8 +1122,9 @@ cairo_private cairo_status_t
_cairo_gstate_set_font_size (cairo_gstate_t *gstate,
double size);
cairo_matrix_t
_cairo_gstate_get_font_matrix (cairo_gstate_t *gstate);
void
_cairo_gstate_get_font_matrix (cairo_gstate_t *gstate,
cairo_matrix_t *matrix);
cairo_private cairo_status_t
_cairo_gstate_set_font_matrix (cairo_gstate_t *gstate,