summaryrefslogtreecommitdiff
path: root/pango/pangocairo-fcfont.c
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@gnome.org>2009-01-28 22:07:13 +0000
committerBehdad Esfahbod <behdad@src.gnome.org>2009-01-28 22:07:13 +0000
commitd9f876c81e5ebcc820639f4b08196e3017680305 (patch)
tree26ab41914945c740834782bc0a763519604e8f13 /pango/pangocairo-fcfont.c
parent3b466a96aff08a4b7749742abf7019377dda8496 (diff)
downloadpango-d9f876c81e5ebcc820639f4b08196e3017680305.tar.gz
Remove context argument from _pango_cairo_font_private_initialize().
2009-01-09 Behdad Esfahbod <behdad@gnome.org> * pango/pangocairo-atsuifont.c (_pango_cairo_atsui_font_new): * pango/pangocairo-fcfont.c (_pango_cairo_fc_font_new): * pango/pangocairo-font.c (_pango_cairo_font_private_initialize): * pango/pangocairo-private.h: * pango/pangocairo-win32font.c (_pango_cairo_win32_font_new): Remove context argument from _pango_cairo_font_private_initialize(). Replace it with pango_ctm and font_options, the only things from context we actually needed. This is in preparation for lazy loading of fonts in the pangofc fontmap. svn path=/trunk/; revision=2801
Diffstat (limited to 'pango/pangocairo-fcfont.c')
-rw-r--r--pango/pangocairo-fcfont.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/pango/pangocairo-fcfont.c b/pango/pangocairo-fcfont.c
index 082d3588..8361905e 100644
--- a/pango/pangocairo-fcfont.c
+++ b/pango/pangocairo-fcfont.c
@@ -244,8 +244,9 @@ _pango_cairo_fc_font_new (PangoCairoFcFontMap *cffontmap,
_pango_cairo_font_private_initialize (&cffont->cf_priv,
(PangoCairoFont *) cffont,
- context,
desc,
+ _pango_cairo_context_get_merged_font_options (context),
+ pango_context_get_matrix (context),
&font_matrix);
((PangoFcFont *)(cffont))->is_hinted = _pango_cairo_font_private_is_metrics_hinted (&cffont->cf_priv);