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, 2 insertions, 8 deletions

diff --git a/pango/break.c b/pango/break.c
index aafa503f..eea7efa5 100644
--- a/pango/break.c
+++ b/pango/break.c
@@ -561,10 +561,7 @@ pango_default_break (const gchar   *text,
   if (length == 0 || *text == '\0')
     next_wc = PARAGRAPH_SEPARATOR;
   else
-    {
-      next_wc = g_utf8_get_char (next);
-      g_assert (next_wc != 0);
-    }
+    next_wc = g_utf8_get_char (next);
 
   next_break_type = g_unichar_break_type (next_wc);
   next_break_type = BREAK_TYPE_SAFE (next_break_type);
@@ -605,10 +602,7 @@ pango_default_break (const gchar   *text,
 	      almost_done = TRUE;
             }
           else
-            {
-              next_wc = g_utf8_get_char (next);
-              g_assert (next_wc != 0);
-            }
+	    next_wc = g_utf8_get_char (next);
 	  
 	  next_break_type = g_unichar_break_type (next_wc);
           next_break_type = BREAK_TYPE_SAFE (next_break_type);