diff options
| author | Behdad Esfahbod <behdad@gnome.org> | 2007-11-30 04:29:58 +0000 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@src.gnome.org> | 2007-11-30 04:29:58 +0000 |
| commit | a8e3d34ea91d80b5032ae0029cdcd7e97f83da7f (patch) | |
| tree | 97d0dfb5c0017e44c1b596da1ef954d12a24f863 /pango/pangocairo-win32font.c | |
| parent | f802d542d6c1ab729cabd90a9c72891f1c2c8ee8 (diff) | |
| download | pango-a8e3d34ea91d80b5032ae0029cdcd7e97f83da7f.tar.gz | |
Bug 485536 – underline_position can be zero
2007-11-29 Behdad Esfahbod <behdad@gnome.org>
Bug 485536 – underline_position can be zero
* pango/pango-utils.c (pango_cairo_quantize_line_geometry):
Document that returned position may be zero.
* pango/pangocairo-win32font.c
(pango_cairo_win32_font_create_metrics_for_context):
* pango/pangofc-font.c (get_face_metrics):
Handle case of underline_position==0 after rounding.
svn path=/trunk/; revision=2506
Diffstat (limited to 'pango/pangocairo-win32font.c')
| -rw-r--r-- | pango/pangocairo-win32font.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pango/pangocairo-win32font.c b/pango/pangocairo-win32font.c index af4e1d07..d01e6f0b 100644 --- a/pango/pangocairo-win32font.c +++ b/pango/pangocairo-win32font.c @@ -140,6 +140,9 @@ pango_cairo_win32_font_create_metrics_for_context (PangoCairoFont *font, &metrics->underline_position); pango_quantize_line_geometry (&metrics->strikethrough_thickness, &metrics->strikethrough_position); + /* Quantizing may have pushed underline_position to 0. Not good */ + if (metrics->underline_position == 0) + metrics->underline_position = - metrics->underline_thickness; layout = pango_layout_new (context); font_desc = pango_font_describe_with_absolute_size ((PangoFont *) font); |