diff --git a/ChangeLog b/ChangeLog index 31d9fcefd..fdf3bd98a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2003-12-16 Carl Worth + * src/cairo_ft_font.c (_cairo_ft_font_glyph_path): + (_cairo_ft_font_text_path): A couple of changes missed in the last + batch of commits (reordering so that path is final argument). + * src/cairoint.h: Change cairo_font_backend_t to use a void * for the abstract font. Put create, copy, and destroy as the first functions in the list. Fix text_path and glyph_path so that the diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c index f8b51be61..32ad49c31 100644 --- a/src/cairo-ft-font.c +++ b/src/cairo-ft-font.c @@ -591,10 +591,10 @@ _cairo_ft_font_show_text (void *abstract_font, static cairo_status_t -_cairo_ft_font_glyph_path (cairo_font_t *font, - cairo_path_t *path, - cairo_glyph_t *glyphs, - int num_glyphs) +_cairo_ft_font_glyph_path (void *font, + cairo_glyph_t *glyphs, + int num_glyphs, + cairo_path_t *path) { cairo_status_t status = CAIRO_STATUS_SUCCESS; cairo_ft_font_t *ft; @@ -608,10 +608,10 @@ _cairo_ft_font_glyph_path (cairo_font_t *font, static cairo_status_t _cairo_ft_font_text_path (void *abstract_font, - cairo_path_t *path, double x, double y, - const unsigned char *utf8) + const unsigned char *utf8, + cairo_path_t *path) { cairo_ft_font_t *font = abstract_font; cairo_glyph_t *glyphs; diff --git a/src/cairo_ft_font.c b/src/cairo_ft_font.c index f8b51be61..32ad49c31 100644 --- a/src/cairo_ft_font.c +++ b/src/cairo_ft_font.c @@ -591,10 +591,10 @@ _cairo_ft_font_show_text (void *abstract_font, static cairo_status_t -_cairo_ft_font_glyph_path (cairo_font_t *font, - cairo_path_t *path, - cairo_glyph_t *glyphs, - int num_glyphs) +_cairo_ft_font_glyph_path (void *font, + cairo_glyph_t *glyphs, + int num_glyphs, + cairo_path_t *path) { cairo_status_t status = CAIRO_STATUS_SUCCESS; cairo_ft_font_t *ft; @@ -608,10 +608,10 @@ _cairo_ft_font_glyph_path (cairo_font_t *font, static cairo_status_t _cairo_ft_font_text_path (void *abstract_font, - cairo_path_t *path, double x, double y, - const unsigned char *utf8) + const unsigned char *utf8, + cairo_path_t *path) { cairo_ft_font_t *font = abstract_font; cairo_glyph_t *glyphs;