diff options
| author | Behdad Esfahbod <behdad@gnome.org> | 2006-02-21 10:12:02 +0000 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@src.gnome.org> | 2006-02-21 10:12:02 +0000 |
| commit | 64691f1398152413f91ebe6906806eb9eb8801b1 (patch) | |
| tree | 31b205b6594685a7b24de8acb7b23d4b94f7a48b /pango/pangofc-fontmap.c | |
| parent | a8f4e10b37a927543dfebe1a37a4d33463a209fc (diff) | |
| download | pango-64691f1398152413f91ebe6906806eb9eb8801b1.tar.gz | |
Change g_critical to g_warning. We already handle them gracefully.
2006-02-21 Behdad Esfahbod <behdad@gnome.org>
* pango/fonts.c, pango/glyphstring.c, pango/pango-fontmap.c,
pango/pango-ot-buffer.c, pango/pangocairo-font.c, pango/pangoft2.c,
pango/pangoxft-font.c, pango/shape.c: Change g_critical to g_warning.
We already handle them gracefully.
Bug 331994 – --disable-debug removes G_DISABLE_CAST_CHECKS
Patch from charlet@act-europe.fr
* configure.in: Do not lose PANGO_DEBUG_FLAGS when reassigning.
Bug 331995 – pango_layout_set_text optimization
Patch from charlet@act-europe.fr
* pango/pango-layout.c: Do not validate input text if asserts are
disabled. Moreover, do not truncate input text on invalid sequence.
Bug 331996 – avoid crashes in win32 font handling
Patch from charlet@act-europe.fr
* pango/pangofc-fontmap.c, pango/pangowin32-fontmap.c,
pango/pangowin32.c: if (!font) return NULL in a number of places.
Diffstat (limited to 'pango/pangofc-fontmap.c')
| -rw-r--r-- | pango/pangofc-fontmap.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/pango/pangofc-fontmap.c b/pango/pangofc-fontmap.c index 8b395987..654edbe2 100644 --- a/pango/pangofc-fontmap.c +++ b/pango/pangofc-fontmap.c @@ -850,12 +850,6 @@ pango_fc_font_map_new_font (PangoFontMap *fontmap, PangoFcFont *fcfont; GSList *l; - /* Returning NULL here actually violates a contract - * that loading load_font() will never return NULL. - * We probably should actually create a dummy - * font that doesn't draw anything and has empty - * metrics. - */ if (priv->closed) return NULL; @@ -904,6 +898,9 @@ pango_fc_font_map_new_font (PangoFontMap *fontmap, FcPatternDestroy (pattern); } + if (!fcfont) + return NULL; + pango_fc_font_map_add (fcfontmap, context, fcfont); /* |