summaryrefslogtreecommitdiff
path: root/src/cairo-win32-font.c
diff options
context:
space:
mode:
authorCarl Worth <cworth@cworth.org>2005-04-07 10:01:49 +0000
committerCarl Worth <cworth@cworth.org>2005-04-07 10:01:49 +0000
commitd135938efd443e4adce63cf8c5926ac421b2d3ed (patch)
treef0398b406ea37889ff7604a834be4eedeeab91ae /src/cairo-win32-font.c
parent92060c12ee2acc38541ec2398abba5e1569278de (diff)
Rework the cairo_matrix_t interface in several ways. Expose a struct for cairo_matrix_t.
Add new function to return current matrix: cairo_get_matrix Deprecate the following functions (in documentation): cairo_matrix_create cairo_matrix_destroy cairo_matrix_get_affine Rename: cairo_matrix_set_affine -> cairo_matrix_init cairo_matrix_set_identity -> cairo_matrix_init_identity Add other new matrix initialization functions: cairo_matrix_init_translate cairo_matrix_init_scale cairo_matrix_init_rotate Change return type of almost all cairo_matrix functions from cairo_status_t to void. Track changes to cairo_matrix_t interface. Add a test case showing the same path drawn under various transforms, (including skews set directly by initializing a cairo_matrix_t).
Diffstat (limited to 'src/cairo-win32-font.c')
-rw-r--r--src/cairo-win32-font.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/cairo-win32-font.c b/src/cairo-win32-font.c
index 2f43623de..3ecf105fb 100644
--- a/src/cairo-win32-font.c
+++ b/src/cairo-win32-font.c
@@ -138,12 +138,12 @@ _compute_transform (cairo_win32_font_t *font,
/* The font matrix has x and y "scale" components which we extract and
* use as character scale values.
*/
- cairo_matrix_set_affine (&font->logical_to_device,
- sc->matrix[0][0],
- sc->matrix[0][1],
- sc->matrix[1][0],
- sc->matrix[1][1],
- 0, 0);
+ cairo_matrix_init (&font->logical_to_device,
+ sc->matrix[0][0],
+ sc->matrix[0][1],
+ sc->matrix[1][0],
+ sc->matrix[1][1],
+ 0, 0);
if (!font->preserve_axes) {
_cairo_matrix_compute_scale_factors (&font->logical_to_device,
@@ -159,7 +159,7 @@ _compute_transform (cairo_win32_font_t *font,
font->device_to_logical = font->logical_to_device;
if (!CAIRO_OK (cairo_matrix_invert (&font->device_to_logical)))
- cairo_matrix_set_identity (&font->device_to_logical);
+ cairo_matrix_init_identity (&font->device_to_logical);
}
static BYTE