From 7782bba2c87b79bff8fa4e62ed84b95b74574617 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Thu, 3 Feb 2005 20:23:19 +0000 Subject: Open the file with mode "wb", include cairo-png.h. 2005-02-03 Owen Taylor * examples/cairosimple.c: Open the file with mode "wb", include cairo-png.h. * examples/xftview.c examples/cairoview.c: Set WM_NORMAL_HINTS to avoid triggering a metacity bug. * examples/cairoview.c: Include cairo-xlib.h. * configure.in: Add checks for the Win32 Cairo backend. (not committing the code yet). * examples/Makefile.am pango/Makefile.am: add CAIRO_CFLAGS. * pango/pangocairo-fc.h pango/pangocairo-fcfont.c pango/pangocairo-fcfontmap.c pango/pangofc-fontmap.[ch]: Rework Cairo/Fontconfig backend to use the current Cairo API. Make some PangoFcFontMap changes to enable that. * pango/pango/pangocairo-private.h pango/pangocairo-render.c: Update for cairo_font_t changes. --- pango/pangocairo-fcfontmap.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) (limited to 'pango/pangocairo-fcfontmap.c') diff --git a/pango/pangocairo-fcfontmap.c b/pango/pangocairo-fcfontmap.c index 0d05c422..e05fd279 100644 --- a/pango/pangocairo-fcfontmap.c +++ b/pango/pangocairo-fcfontmap.c @@ -99,11 +99,24 @@ pango_cairo_fc_font_map_default_substitute (PangoFcFontMap *fcfontmap, FcDefaultSubstitute (pattern); } +static gboolean +pango_cairo_fc_font_map_get_render_key (PangoFcFontMap *fcfontmap, + PangoContext *context, + const PangoFontDescription *desc, + int *xsize, + int *ysize, + guint *flags) +{ + return _pango_cairo_fc_get_render_key (PANGO_CAIRO_FC_FONT_MAP (fcfontmap), + context, desc, xsize, ysize, flags); +} + static PangoFcFont * -pango_cairo_fc_font_map_new_font (PangoFcFontMap *fcfontmap, - FcPattern *pattern) +pango_cairo_fc_font_map_create_font (PangoFcFontMap *fcfontmap, + PangoContext *context, + FcPattern *pattern) { - return _pango_cairo_fc_font_new (PANGO_CAIRO_FC_FONT_MAP (fcfontmap), pattern); + return _pango_cairo_fc_font_new (PANGO_CAIRO_FC_FONT_MAP (fcfontmap), context, pattern); } static void @@ -114,7 +127,8 @@ pango_cairo_fc_font_map_class_init (PangoCairoFcFontMapClass *class) gobject_class->finalize = pango_cairo_fc_font_map_finalize; fcfontmap_class->default_substitute = pango_cairo_fc_font_map_default_substitute; - fcfontmap_class->new_font = pango_cairo_fc_font_map_new_font; + fcfontmap_class->get_render_key = pango_cairo_fc_font_map_get_render_key; + fcfontmap_class->create_font = pango_cairo_fc_font_map_create_font; } static void -- cgit v1.2.1