diff options
| author | Behdad Esfahbod <behdad@gnome.org> | 2009-01-28 22:07:13 +0000 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@src.gnome.org> | 2009-01-28 22:07:13 +0000 |
| commit | d9f876c81e5ebcc820639f4b08196e3017680305 (patch) | |
| tree | 26ab41914945c740834782bc0a763519604e8f13 /pango/pangocairo-font.c | |
| parent | 3b466a96aff08a4b7749742abf7019377dda8496 (diff) | |
| download | pango-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-font.c')
| -rw-r--r-- | pango/pangocairo-font.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/pango/pangocairo-font.c b/pango/pangocairo-font.c index 472a0261..64655428 100644 --- a/pango/pangocairo-font.c +++ b/pango/pangocairo-font.c @@ -515,13 +515,12 @@ _pango_cairo_font_get_hex_box_info (PangoCairoFont *cfont) void _pango_cairo_font_private_initialize (PangoCairoFontPrivate *cf_priv, PangoCairoFont *cfont, - PangoContext *context, const PangoFontDescription *desc, + const cairo_font_options_t *font_options, + const PangoMatrix *pango_ctm, const cairo_matrix_t *font_matrix) { - const cairo_font_options_t *font_options; cairo_matrix_t gravity_matrix; - const PangoMatrix *pango_ctm; cf_priv->cfont = cfont; cf_priv->gravity = pango_font_description_get_gravity (desc); @@ -538,7 +537,6 @@ _pango_cairo_font_private_initialize (PangoCairoFontPrivate *cf_priv, font_matrix, &gravity_matrix); - pango_ctm = pango_context_get_matrix (context); if (pango_ctm) cairo_matrix_init (&cf_priv->data->ctm, pango_ctm->xx, @@ -549,7 +547,6 @@ _pango_cairo_font_private_initialize (PangoCairoFontPrivate *cf_priv, else cairo_matrix_init_identity (&cf_priv->data->ctm); - font_options = _pango_cairo_context_get_merged_font_options (context); cf_priv->data->options = cairo_font_options_copy (font_options); cf_priv->is_hinted = cairo_font_options_get_hint_metrics (font_options) != CAIRO_HINT_METRICS_OFF; |