From 1a00555cd87c8454301b65fe7939e277b7d67998 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@gnome.org>
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  <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...
---
 pango/pango-coverage.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'pango/pango-coverage.c')

diff --git a/pango/pango-coverage.c b/pango/pango-coverage.c
index 2a68ea05..6e34f802 100644
--- a/pango/pango-coverage.c
+++ b/pango/pango-coverage.c
@@ -58,7 +58,7 @@ struct _PangoCoverage
 PangoCoverage *
 pango_coverage_new (void)
 {
-  PangoCoverage *coverage = g_new (PangoCoverage, 1);
+  PangoCoverage *coverage = g_slice_new (PangoCoverage);
 
   coverage->n_blocks = N_BLOCKS_INCREMENT;
   coverage->blocks = g_new0 (PangoBlockInfo, coverage->n_blocks);
@@ -85,7 +85,7 @@ pango_coverage_copy (PangoCoverage *coverage)
 
   g_return_val_if_fail (coverage != NULL, NULL);
 
-  result = g_new (PangoCoverage, 1);
+  result = g_slice_new (PangoCoverage);
   result->n_blocks = coverage->n_blocks;
   result->blocks = g_new (PangoBlockInfo, coverage->n_blocks);
   result->ref_count = 1;
@@ -150,7 +150,7 @@ pango_coverage_unref (PangoCoverage *coverage)
 	}
       
       g_free (coverage->blocks);
-      g_free (coverage);
+      g_slice_free (PangoCoverage, coverage);
     }
 }
 
@@ -447,7 +447,7 @@ PangoCoverage *
 pango_coverage_from_bytes (guchar *bytes,
 			   int     n_bytes)
 {
-  PangoCoverage *coverage = g_new0 (PangoCoverage, 1);
+  PangoCoverage *coverage = g_slice_new0 (PangoCoverage);
   guchar *ptr = bytes;
   int i;
 
-- 
cgit v1.2.1