diff options
| author | Behdad Esfahbod <behdad@gnome.org> | 2006-01-29 23:06:59 +0000 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@src.gnome.org> | 2006-01-29 23:06:59 +0000 |
| commit | 1a00555cd87c8454301b65fe7939e277b7d67998 (patch) | |
| tree | e990bb0669d6b249f3d8c7bc71145c4f5fb43ac9 /modules/hebrew | |
| parent | 9d18a76a5d226de48eb41f0c2ba23d7e42195ff8 (diff) | |
| download | pango-1a00555cd87c8454301b65fe7939e277b7d67998.tar.gz | |
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...
Diffstat (limited to 'modules/hebrew')
| -rw-r--r-- | modules/hebrew/hebrew-fc.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/modules/hebrew/hebrew-fc.c b/modules/hebrew/hebrew-fc.c index c22f118f..9ffe289c 100644 --- a/modules/hebrew/hebrew-fc.c +++ b/modules/hebrew/hebrew-fc.c @@ -295,14 +295,15 @@ hebrew_engine_shape (PangoEngineShape *engine, PangoAnalysis *analysis, PangoGlyphString *glyphs) { - const gchar *p; - gint i; - glong n_chars; - gint unknown_property = 0; + PangoFcFont *fc_font; FT_Face face; PangoOTRuleset *ruleset; PangoOTBuffer *buffer; - PangoFcFont *fc_font; + gint unknown_property = 0; + glong n_chars; + const char *p; + int cluster = 0; + int i; g_return_if_fail (font != NULL); g_return_if_fail (text != NULL); @@ -310,9 +311,8 @@ hebrew_engine_shape (PangoEngineShape *engine, g_return_if_fail (analysis != NULL); fc_font = PANGO_FC_FONT (font); - face = pango_fc_font_lock_face (fc_font); - g_assert (face); + g_return_if_fail (face != NULL); ruleset = get_ruleset (face); if (!ruleset) @@ -327,7 +327,6 @@ hebrew_engine_shape (PangoEngineShape *engine, n_chars = g_utf8_strlen (text, length); p = text; - for (i=0; i < n_chars; i++) { gunichar wc; @@ -335,7 +334,6 @@ hebrew_engine_shape (PangoEngineShape *engine, PangoGlyph index; char buf[6]; const char *input; - int cluster = 0; wc = g_utf8_get_char (p); input = p; |