diff options
| author | Behdad Esfahbod <behdad@gnome.org> | 2006-08-20 20:35:45 +0000 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@src.gnome.org> | 2006-08-20 20:35:45 +0000 |
| commit | d166f21c486ecda8c67d94ec0392f837c5f3eea9 (patch) | |
| tree | 48ea486638afadaf9d734c59f9bbb06102f5e4a0 /pango/pangocairo-fcfont.c | |
| parent | 919d3089dae2e2ad011c9b94b4847c30b536ac63 (diff) | |
| download | pango-d166f21c486ecda8c67d94ec0392f837c5f3eea9.tar.gz | |
Correct switched return value of EAST/WEST.
2006-08-20 Behdad Esfahbod <behdad@gnome.org>
* pango/pango-matrix.c (pango_matrix_to_gravity): Correct switched
return value of EAST/WEST.
* pango/pango-types.h (PangoGravity): Add PANGO_GRAVITY_AUTO.
* pango/pango-context.h: Add pango_context_get_gravity().
* examples/renderdemo.c (parse_gravity), (parse_options):
* pango/pango-context.c (pango_context_init),
(update_resolved_gravity), (pango_context_set_matrix),
(pango_context_set_base_gravity), (pango_context_get_gravity),
(itemize_state_init), (get_shaper_and_font):
* pango/pango-layout.c (line_set_resolved_dir):
* pango/pangocairo-fcfont.c (pango_cairo_fc_font_get_metrics),
(pango_cairo_fc_font_glyph_extents_cache_init),
(_pango_cairo_fc_font_new):
* pango/pangofc-fontmap.c (pango_fc_make_pattern),
(pango_fc_font_map_load_fontset):
* pango/pango.def:
* docs/pango-sections.txt:
* docs/tmpl/main.sgml:
Update to above.
Diffstat (limited to 'pango/pangocairo-fcfont.c')
| -rw-r--r-- | pango/pangocairo-fcfont.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pango/pangocairo-fcfont.c b/pango/pangocairo-fcfont.c index a0dec5c6..f6ce1087 100644 --- a/pango/pangocairo-fcfont.c +++ b/pango/pangocairo-fcfont.c @@ -239,6 +239,7 @@ pango_cairo_fc_font_get_metrics (PangoFont *font, switch (cffont->gravity) { default: + case PANGO_GRAVITY_AUTO: case PANGO_GRAVITY_SOUTH: break; case PANGO_GRAVITY_NORTH: @@ -299,6 +300,7 @@ pango_cairo_fc_font_glyph_extents_cache_init (PangoCairoFcFont *cffont) switch (cffont->gravity) { default: + case PANGO_GRAVITY_AUTO: case PANGO_GRAVITY_SOUTH: cffont->font_extents.y = - PANGO_UNITS (font_extents.ascent); break; @@ -506,7 +508,7 @@ _pango_cairo_fc_font_new (PangoCairoFcFontMap *cffontmap, NULL); /* FIXME: support per-item gravity */ - cffont->gravity = pango_context_get_base_gravity (context); + cffont->gravity = pango_context_get_gravity (context); if (FcPatternGetMatrix (pattern, FC_MATRIX, 0, &fc_matrix) == FcResultMatch) |