From 9d9369dc05e7df4558fc8ba36b7ec2dd969ae64f Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Tue, 21 Feb 2006 11:41:12 +0000 Subject: =?UTF-8?q?Bug=20314239=20=E2=80=93=20pangocairo=20crashes=20when?= =?UTF-8?q?=20font=20cannot=20be=20read?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2006-02-21 Behdad Esfahbod Bug 314239 – pangocairo crashes when font cannot be read * pango/pangocairo-fcfont.c, pango/pangocairo-font.c: Hack up to not crash if we cannot create cairo_scaled_font_t for PangoFont (font is not readable, removed, etc.) --- pango/pangofc-font.c | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'pango/pangofc-font.c') diff --git a/pango/pangofc-font.c b/pango/pangofc-font.c index 5bea0e81..d6e2d8fd 100644 --- a/pango/pangofc-font.c +++ b/pango/pangofc-font.c @@ -291,6 +291,17 @@ get_face_metrics (PangoFcFont *fcfont, TT_OS2 *os2; gboolean have_transform = FALSE; + if (!face) + { + metrics->descent = 0; + metrics->ascent = PANGO_SCALE * PANGO_UNKNOWN_GLYPH_HEIGHT; + metrics->underline_thickness = PANGO_SCALE; + metrics->underline_position = - PANGO_SCALE; + metrics->strikethrough_thickness = PANGO_SCALE; + metrics->strikethrough_position = PANGO_SCALE * (PANGO_UNKNOWN_GLYPH_HEIGHT/2); + return; + } + if (FcPatternGetMatrix (fcfont->font_pattern, FC_MATRIX, 0, &fc_matrix) == FcResultMatch) { -- cgit v1.2.1