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 /pango/fonts.c | |
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 'pango/fonts.c')
-rw-r--r-- | pango/fonts.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pango/fonts.c b/pango/fonts.c index 0c0b4fa5..2142d58b 100644 --- a/pango/fonts.c +++ b/pango/fonts.c @@ -85,7 +85,7 @@ static const PangoFontDescription pfd_defaults = { PangoFontDescription * pango_font_description_new (void) { - PangoFontDescription *desc = g_new (PangoFontDescription, 1); + PangoFontDescription *desc = g_slice_new (PangoFontDescription); *desc = pfd_defaults; @@ -596,7 +596,7 @@ pango_font_description_better_match (const PangoFontDescription *desc, PangoFontDescription * pango_font_description_copy (const PangoFontDescription *desc) { - PangoFontDescription *result = g_new (PangoFontDescription, 1); + PangoFontDescription *result = g_slice_new (PangoFontDescription); *result = *desc; @@ -624,7 +624,7 @@ pango_font_description_copy (const PangoFontDescription *desc) PangoFontDescription * pango_font_description_copy_static (const PangoFontDescription *desc) { - PangoFontDescription *result = g_new (PangoFontDescription, 1); + PangoFontDescription *result = g_slice_new (PangoFontDescription); *result = *desc; if (result->family_name) @@ -723,7 +723,7 @@ pango_font_description_free (PangoFontDescription *desc) if (desc->family_name && !desc->static_family) g_free (desc->family_name); - g_free (desc); + g_slice_free (PangoFontDescription, desc); } } @@ -883,7 +883,7 @@ pango_font_description_from_string (const char *str) g_return_val_if_fail (str != NULL, NULL); - desc = g_new (PangoFontDescription, 1); + desc = g_slice_new (PangoFontDescription); desc->mask = PANGO_FONT_MASK_STYLE | PANGO_FONT_MASK_WEIGHT | @@ -1236,7 +1236,7 @@ pango_font_metrics_get_type (void) PangoFontMetrics * pango_font_metrics_new (void) { - PangoFontMetrics *metrics = g_new0 (PangoFontMetrics, 1); + PangoFontMetrics *metrics = g_slice_new0 (PangoFontMetrics); metrics->ref_count = 1; return metrics; @@ -1277,7 +1277,7 @@ pango_font_metrics_unref (PangoFontMetrics *metrics) metrics->ref_count--; if (metrics->ref_count == 0) - g_free (metrics); + g_slice_free (PangoFontMetrics, metrics); } /** |