diff options
| author | Behdad Esfahbod <behdad@gnome.org> | 2009-01-28 22:07:30 +0000 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@src.gnome.org> | 2009-01-28 22:07:30 +0000 |
| commit | ceb03fea0dd21294e5b7eb13d8bc6b94b512037e (patch) | |
| tree | 8172633fc9e1983e7f7ebf857656da7c1522b745 | |
| parent | c436a45f4022fb8a4ac5dccc45f0c6427f332c1f (diff) | |
| download | pango-ceb03fea0dd21294e5b7eb13d8bc6b94b512037e.tar.gz | |
Remove desc argument from _pango_cairo_font_private_initialize(). Replace
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 desc argument from _pango_cairo_font_private_initialize().
Replace it with gravity, the only thing from desc we actually needed.
This is in preparation for lazy loading of fonts in the pangofc fontmap.
svn path=/trunk/; revision=2803
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | pango/pangocairo-atsuifont.c | 2 | ||||
| -rw-r--r-- | pango/pangocairo-fcfont.c | 2 | ||||
| -rw-r--r-- | pango/pangocairo-font.c | 4 | ||||
| -rw-r--r-- | pango/pangocairo-private.h | 2 | ||||
| -rw-r--r-- | pango/pangocairo-win32font.c | 2 |
6 files changed, 17 insertions, 6 deletions
@@ -1,5 +1,16 @@ 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 desc argument from _pango_cairo_font_private_initialize(). + Replace it with gravity, the only thing from desc we actually needed. + This is in preparation for lazy loading of fonts in the pangofc fontmap. + +2009-01-09 Behdad Esfahbod <behdad@gnome.org> + * pango/pangofc-fontmap.c (font_hash_key_equal): Avoid context key comparison if any of the keys is NULL. diff --git a/pango/pangocairo-atsuifont.c b/pango/pangocairo-atsuifont.c index e815b54f..d97e1d93 100644 --- a/pango/pangocairo-atsuifont.c +++ b/pango/pangocairo-atsuifont.c @@ -308,7 +308,7 @@ _pango_cairo_atsui_font_new (PangoCairoATSUIFontMap *cafontmap, _pango_cairo_font_private_initialize (&cafont->cf_priv, (PangoCairoFont *) cafont, - desc, + pango_font_description_get_gravity (desc), _pango_cairo_context_get_merged_font_options (context), pango_context_get_matrix (context), &font_matrix); diff --git a/pango/pangocairo-fcfont.c b/pango/pangocairo-fcfont.c index 8361905e..129fa865 100644 --- a/pango/pangocairo-fcfont.c +++ b/pango/pangocairo-fcfont.c @@ -244,7 +244,7 @@ _pango_cairo_fc_font_new (PangoCairoFcFontMap *cffontmap, _pango_cairo_font_private_initialize (&cffont->cf_priv, (PangoCairoFont *) cffont, - desc, + pango_font_description_get_gravity (desc), _pango_cairo_context_get_merged_font_options (context), pango_context_get_matrix (context), &font_matrix); diff --git a/pango/pangocairo-font.c b/pango/pangocairo-font.c index 64655428..8f976b73 100644 --- a/pango/pangocairo-font.c +++ b/pango/pangocairo-font.c @@ -515,7 +515,7 @@ _pango_cairo_font_get_hex_box_info (PangoCairoFont *cfont) void _pango_cairo_font_private_initialize (PangoCairoFontPrivate *cf_priv, PangoCairoFont *cfont, - const PangoFontDescription *desc, + PangoGravity gravity, const cairo_font_options_t *font_options, const PangoMatrix *pango_ctm, const cairo_matrix_t *font_matrix) @@ -523,7 +523,7 @@ _pango_cairo_font_private_initialize (PangoCairoFontPrivate *cf_priv, cairo_matrix_t gravity_matrix; cf_priv->cfont = cfont; - cf_priv->gravity = pango_font_description_get_gravity (desc); + cf_priv->gravity = gravity; cf_priv->data = _pango_cairo_font_private_scaled_font_data_create (); diff --git a/pango/pangocairo-private.h b/pango/pangocairo-private.h index 271c2152..3a4a9d0e 100644 --- a/pango/pangocairo-private.h +++ b/pango/pangocairo-private.h @@ -109,7 +109,7 @@ PangoCairoFontHexBoxInfo *_pango_cairo_font_get_hex_box_info (PangoCairoFont *cf void _pango_cairo_font_private_initialize (PangoCairoFontPrivate *cf_priv, PangoCairoFont *font, - const PangoFontDescription *desc, + PangoGravity gravity, const cairo_font_options_t *font_options, const PangoMatrix *pango_ctm, const cairo_matrix_t *font_matrix); diff --git a/pango/pangocairo-win32font.c b/pango/pangocairo-win32font.c index 7fd29f47..3493d582 100644 --- a/pango/pangocairo-win32font.c +++ b/pango/pangocairo-win32font.c @@ -318,7 +318,7 @@ _pango_cairo_win32_font_new (PangoCairoWin32FontMap *cwfontmap, _pango_cairo_font_private_initialize (&cwfont->cf_priv, (PangoCairoFont *) cwfont, - desc, + pango_font_description_get_gravity (desc), _pango_cairo_context_get_merged_font_options (context), pango_context_get_matrix (context), &font_matrix); |