diff options
Diffstat (limited to 'pango')
| -rw-r--r-- | pango/pangocairo-atsuifont.c | 3 | ||||
| -rw-r--r-- | pango/pangocairo-fcfont.c | 3 | ||||
| -rw-r--r-- | pango/pangocairo-font.c | 7 | ||||
| -rw-r--r-- | pango/pangocairo-private.h | 3 | ||||
| -rw-r--r-- | pango/pangocairo-win32font.c | 3 |
5 files changed, 10 insertions, 9 deletions
diff --git a/pango/pangocairo-atsuifont.c b/pango/pangocairo-atsuifont.c index ac060ccd..e815b54f 100644 --- a/pango/pangocairo-atsuifont.c +++ b/pango/pangocairo-atsuifont.c @@ -308,8 +308,9 @@ _pango_cairo_atsui_font_new (PangoCairoATSUIFontMap *cafontmap, _pango_cairo_font_private_initialize (&cafont->cf_priv, (PangoCairoFont *) cafont, - context, desc, + _pango_cairo_context_get_merged_font_options (context), + pango_context_get_matrix (context), &font_matrix); return afont; 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); 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; diff --git a/pango/pangocairo-private.h b/pango/pangocairo-private.h index bf53e1f9..271c2152 100644 --- a/pango/pangocairo-private.h +++ b/pango/pangocairo-private.h @@ -109,8 +109,9 @@ PangoCairoFontHexBoxInfo *_pango_cairo_font_get_hex_box_info (PangoCairoFont *cf void _pango_cairo_font_private_initialize (PangoCairoFontPrivate *cf_priv, PangoCairoFont *font, - PangoContext *context, const PangoFontDescription *desc, + const cairo_font_options_t *font_options, + const PangoMatrix *pango_ctm, const cairo_matrix_t *font_matrix); void _pango_cairo_font_private_finalize (PangoCairoFontPrivate *cf_priv); cairo_scaled_font_t *_pango_cairo_font_private_get_scaled_font (PangoCairoFontPrivate *cf_priv); diff --git a/pango/pangocairo-win32font.c b/pango/pangocairo-win32font.c index 4dda4ece..7fd29f47 100644 --- a/pango/pangocairo-win32font.c +++ b/pango/pangocairo-win32font.c @@ -318,8 +318,9 @@ _pango_cairo_win32_font_new (PangoCairoWin32FontMap *cwfontmap, _pango_cairo_font_private_initialize (&cwfont->cf_priv, (PangoCairoFont *) cwfont, - context, desc, + _pango_cairo_context_get_merged_font_options (context), + pango_context_get_matrix (context), &font_matrix); return PANGO_FONT (cwfont); |