From 545c18d269ec738dce4f30affb265440bec27574 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Thu, 7 Apr 2005 18:30:23 +0000 Subject: Update to new Cairo font API. 2005-04-07 Owen Taylor * pango/pangocairo-fcfont.c pango/pangocairo-win32font.c pango/pangocairo-render.c: Update to new Cairo font API. * pangpopangowin32.h pango/pangowin32-private.h pango/pangowin32.c pango/pangocairo-win32font.c modules/basic/basic-win32.c: Rename get_scale_factor() to get_metrics_factor() to match Cairo --- pango/pangocairo-render.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'pango/pangocairo-render.c') diff --git a/pango/pangocairo-render.c b/pango/pangocairo-render.c index c1598c45..00c1bdc5 100644 --- a/pango/pangocairo-render.c +++ b/pango/pangocairo-render.c @@ -96,8 +96,7 @@ pango_cairo_renderer_draw_glyphs (PangoRenderer *renderer, x_position += gi->geometry.width; } - cairo_set_font (crenderer->cr, - _pango_cairo_font_get_cairo_font (PANGO_CAIRO_FONT (font))); + _pango_cairo_font_install (PANGO_CAIRO_FONT (font), crenderer->cr); if (crenderer->do_path) cairo_glyph_path (crenderer->cr, cairo_glyphs, glyphs->num_glyphs); @@ -423,7 +422,7 @@ pango_cairo_glyph_string_path (cairo_t *cr, crenderer->x_offset = 0.; crenderer->y_offset = 0.; - cairo_set_font (cr, NULL); + cairo_set_font_face (cr, NULL); } /** @@ -465,7 +464,7 @@ pango_cairo_layout_line_path (cairo_t *cr, crenderer->x_offset = 0.; crenderer->y_offset = 0.; - cairo_set_font (cr, NULL); + cairo_set_font_face (cr, NULL); } /** @@ -507,6 +506,6 @@ pango_cairo_layout_path (cairo_t *cr, crenderer->x_offset = 0.; crenderer->y_offset = 0.; - cairo_set_font (cr, NULL); + cairo_set_font_face (cr, NULL); } -- cgit v1.2.1