summaryrefslogtreecommitdiff
path: root/pango/pangoft2.c
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@gnome.org>2006-02-06 11:08:44 +0000
committerBehdad Esfahbod <behdad@src.gnome.org>2006-02-06 11:08:44 +0000
commit9f81790eaec937ced41c31fb6204d63a377a00a7 (patch)
treed00c3ce91fcb08f5742b1a03a1b72ec03fee7b41 /pango/pangoft2.c
parent3293001b8aa09a4e812af974b389843c952871bb (diff)
downloadpango-9f81790eaec937ced41c31fb6204d63a377a00a7.tar.gz
Warn only once per font-description that cannot be loaded.
2006-02-06 Behdad Esfahbod <behdad@gnome.org> * pango/pango-fontmap.c (pango_font_map_real_load_fontset): Warn only once per font-description that cannot be loaded. * pango/pangox.c: Make it not crash if no font found, like other backends.
Diffstat (limited to 'pango/pangoft2.c')
-rw-r--r--pango/pangoft2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/pango/pangoft2.c b/pango/pangoft2.c
index ad23a106..9c245d15 100644
--- a/pango/pangoft2.c
+++ b/pango/pangoft2.c
@@ -327,16 +327,16 @@ pango_ft2_font_get_glyph_extents (PangoFont *font,
if (ink_rect)
{
ink_rect->x = PANGO_SCALE;
+ ink_rect->width = metrics->approximate_char_width - 2 * PANGO_SCALE;
ink_rect->y = - (metrics->ascent - PANGO_SCALE);
ink_rect->height = metrics->ascent + metrics->descent - 2 * PANGO_SCALE;
- ink_rect->width = metrics->approximate_char_width - 2 * PANGO_SCALE;
}
if (logical_rect)
{
logical_rect->x = 0;
+ logical_rect->width = metrics->approximate_char_width;
logical_rect->y = -metrics->ascent;
logical_rect->height = metrics->ascent + metrics->descent;
- logical_rect->width = metrics->approximate_char_width;
}
pango_font_metrics_unref (metrics);