diff options
| author | Owen Taylor <otaylor@redhat.com> | 2005-04-07 11:03:59 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@redhat.com> | 2005-04-07 11:03:59 +0000 |
| commit | 47824dee31acdaf5ad6488dd2714e9f28c936aa2 (patch) | |
| tree | 948833f5fa97fa2e50206c223bbec089eb6d87df /src/cairo-ft.h | |
| parent | d135938efd443e4adce63cf8c5926ac421b2d3ed (diff) | |
| download | cairo-47824dee31acdaf5ad6488dd2714e9f28c936aa2.tar.gz | |
src/cairo.h src/cairo-gstate.c src/cairo-font.c: Add a cairo_font_face_t type to hold a description of a font face. Replace cairo_set_font() with cairo_set_font_face().
src/cairoint.h src/cairo-font.c src/cairo-gstate.c: Add "cairo_simple_font_face" for family/weight/slant and use it to implement font naming for the toy API.
src/cairo-ft.h src/cairo-ft-font.c cairo-win32.h cairo-win32-font.c: Switch the FreeType and Win32 backends over to using cairo_font_face_t.
src/cairo.h src/cairo-font.c src/cairo-ft-font.c src/cairo-win32-font.c: Pass in font matrix and CTM separately rather than as a composite scale when creating fonts; allows removing font_matrix argument to metrics functions.
src/cairoint.h src/cairo-font.c src/cairo-ft-font.c src/cairo-win32-font.c: Remove cairo_font_scale_t type, just use cairo_matrix_t and ignore translations.
src/cairo-ft.h src/cairo-ft-font.c: Remove cairo_ft_font_get_pattern() -- it can't work for all FreeType backend fonts and doesn't seem particularly useful.
Rename cairo_font_get_extents() to cairo_font_extents()
split font functions into a separate section.
Fix locking order problem.
Add caches for simple font faces and from cairo_font_face_t to cairo_scaled_font_t.
src/cairo.h src/cairoint.h src/cairo-font.c src/cairo-win32-font.c src/cairo-ft-font.c src/cairo-gstate.c src/cairo-gstate-private.h: Rename cairo_font_t to cairo_scaled_font_t.
Diffstat (limited to 'src/cairo-ft.h')
| -rw-r--r-- | src/cairo-ft.h | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/src/cairo-ft.h b/src/cairo-ft.h index f10c67d80..071429994 100644 --- a/src/cairo-ft.h +++ b/src/cairo-ft.h @@ -49,23 +49,18 @@ CAIRO_BEGIN_DECLS -cairo_font_t * -cairo_ft_font_create (FcPattern *pattern, - cairo_matrix_t *scale); +cairo_font_face_t * +cairo_ft_font_face_create_for_pattern (FcPattern *pattern); -cairo_font_t * -cairo_ft_font_create_for_ft_face (FT_Face face, - int load_flags, - cairo_matrix_t *scale); +cairo_font_face_t * +cairo_ft_font_face_create_for_ft_face (FT_Face face, + int load_flags); FT_Face -cairo_ft_font_lock_face (cairo_font_t *ft_font); +cairo_ft_scaled_font_lock_face (cairo_scaled_font_t *scaled_font); void -cairo_ft_font_unlock_face (cairo_font_t *ft_font); - -FcPattern * -cairo_ft_font_get_pattern (cairo_font_t *ft_font); +cairo_ft_scaled_font_unlock_face (cairo_scaled_font_t *scaled_font); CAIRO_END_DECLS |