If locking font face failed, do not assert, just return zero glyphs with

2006-01-29  Behdad Esfahbod  <behdad@gnome.org>

        * 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...

1 files changed, 8 insertions, 8 deletions

diff --git a/pango/pangofc-fontmap.c b/pango/pangofc-fontmap.c
index 90c36955..8b395987 100644
--- a/pango/pangofc-fontmap.c
+++ b/pango/pangofc-fontmap.c
@@ -353,13 +353,13 @@ fontset_hash_key_free (FontsetHashKey *key)
     PANGO_FC_FONT_MAP_GET_CLASS (key->fontmap)->context_key_free (key->fontmap,
 								  key->context_key);
   
-  g_free (key);
+  g_slice_free (FontsetHashKey, key);
 }
 
 static FontsetHashKey *
 fontset_hash_key_copy (FontsetHashKey *old)
 {
-  FontsetHashKey *key = g_new (FontsetHashKey, 1);
+  FontsetHashKey *key = g_slice_new (FontsetHashKey);
   
   key->fontmap = old->fontmap;
   key->matrix = old->matrix;
@@ -420,13 +420,13 @@ font_hash_key_free (FontHashKey *key)
     PANGO_FC_FONT_MAP_GET_CLASS (key->fontmap)->context_key_free (key->fontmap,
 								  key->context_key);
   
-  g_free (key);
+  g_slice_free (FontHashKey, key);
 }
 
 static FontHashKey *
 font_hash_key_copy (FontHashKey *old)
 {
-  FontHashKey *key = g_new (FontHashKey, 1);
+  FontHashKey *key = g_slice_new (FontHashKey);
   
   key->fontmap = old->fontmap;
   key->matrix = old->matrix;
@@ -466,7 +466,7 @@ pango_fc_font_map_add_decoder_find_func (PangoFcFontMap        *fcfontmap,
   PangoFcFontMapPrivate *priv = fcfontmap->priv;
   PangoFcFindFuncInfo *info;
 
-  info = g_new (PangoFcFindFuncInfo, 1);
+  info = g_slice_new (PangoFcFindFuncInfo);
 
   info->findfunc = findfunc;
   info->user_data = user_data;
@@ -501,7 +501,7 @@ pango_fc_font_map_finalize (GObject *object)
       if (info->dnotify)
 	info->dnotify (info->user_data);
 
-      g_free (info);
+      g_slice_free (PangoFcFindFuncInfo, info);
       priv->findfuncs = g_slist_delete_link (priv->findfuncs, priv->findfuncs);
     }
 
@@ -1073,7 +1073,7 @@ pango_fc_font_map_get_patterns (PangoFontMap               *fontmap,
 	  exit (1);
 	}
 
-      patterns = g_new (PangoFcPatternSet, 1);
+      patterns = g_slice_new (PangoFcPatternSet);
       patterns->patterns = g_new (FcPattern *, font_patterns->nfont);
       patterns->n_patterns = 0;
       patterns->fontset = NULL;
@@ -1167,7 +1167,7 @@ pango_fc_pattern_set_free (PangoFcPatternSet *patterns)
     FcPatternDestroy (patterns->patterns[i]);
 
   g_free (patterns->patterns);
-  g_free (patterns);
+  g_slice_free (PangoFcPatternSet, patterns);
 }
 
 static void