From 1a00555cd87c8454301b65fe7939e277b7d67998 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Sun, 29 Jan 2006 23:06:59 +0000 Subject: If locking font face failed, do not assert, just return zero glyphs with 2006-01-29 Behdad Esfahbod * modules/arabic/arabic-fc.c, modules/basic/basic-fc.c modules/hebrew/hebrew-fc.c, modules/indic/indic-fc.c modules/khmer/khmer-fc.c, modules/syriac/syriac-fc.c modules/thai/thai-ot.c, modules/thai/thai-shaper.c modules/tibetan/tibetan-fc.c: If locking font face failed, do not assert, just return zero glyphs with an implicit warning. * pango/fonts.c, pango/glyphstring.c pango/modules.c pango/pango-color.c, pango/pango-context.c pango/pango-coverage.c, pango/pango-fontmap.c pango/pango-glyph-item.c, pango/pango-item.c pango/pango-layout.c, pango/pango-markup.c pango/pango-ot-buffer.c, pango/pango-script.c pango/pango-tabs.c, pango/pango-utils.c pango/pangoatsui-fontmap.c, pango/pangocairo-fcfont.c pango/pangocairo-fcfontmap.c, pango/pangocairo-fontmap.c pango/pangocairo-win32font.c, pango/pangofc-font.c pango/pangofc-fontmap.c, pango/pangoft2-fontmap.c pango/pangoft2-render.c, pango/pangoft2.c pango/pangowin32-fontcache.c, pango/pangoxft-font.c pango/pangoxft-render.c, pango/break.c pango/ellipsize.c: Use g_slice for allocating all types. Also, change some g_error's to g_critical's... --- pango/pangofc-font.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pango/pangofc-font.c') diff --git a/pango/pangofc-font.c b/pango/pangofc-font.c index b53dd5fa..953af1d6 100644 --- a/pango/pangofc-font.c +++ b/pango/pangofc-font.c @@ -112,7 +112,7 @@ static void free_metrics_info (PangoFcMetricsInfo *info) { pango_font_metrics_unref (info->metrics); - g_free (info); + g_slice_free (PangoFcMetricsInfo, info); } static void @@ -467,7 +467,7 @@ pango_fc_font_get_metrics (PangoFont *font, if (!fcfont->fontmap) return pango_font_metrics_new (); - info = g_new0 (PangoFcMetricsInfo, 1); + info = g_slice_new0 (PangoFcMetricsInfo); fcfont->metrics_by_lang = g_slist_prepend (fcfont->metrics_by_lang, info); -- cgit v1.2.1