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/pangocairo-win32font.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/pangocairo-win32font.c')
| -rw-r--r-- | pango/pangocairo-win32font.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pango/pangocairo-win32font.c b/pango/pangocairo-win32font.c index 9e770691..d6a563be 100644 --- a/pango/pangocairo-win32font.c +++ b/pango/pangocairo-win32font.c @@ -165,7 +165,7 @@ static void free_metrics_info (PangoWin32MetricsInfo *info) { pango_font_metrics_unref (info->metrics); - g_free (info); + g_slice_free (PangoWin32MetricsInfo, info); } static void @@ -347,7 +347,7 @@ pango_cairo_win32_font_get_metrics (PangoFont *font, if (!win32font->fontmap) return pango_font_metrics_new (); - info = g_new0 (PangoWin32MetricsInfo, 1); + info = g_slice_new0 (PangoWin32MetricsInfo); cwfont->metrics_by_lang = g_slist_prepend (cwfont->metrics_by_lang, info); |