diff options
| author | Owen Taylor <otaylor@redhat.com> | 2003-02-17 22:04:29 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2003-02-17 22:04:29 +0000 |
| commit | 411bd8c907fbf018a8d7529b6a858a8c11f87bd3 (patch) | |
| tree | 12408b3fbbaaca409e202dab63eecc3e5e2c8712 /pango/pangoxft-font.c | |
| parent | 837fdf20fad1c7d3302f5ccf2fb9eada57a6067d (diff) | |
| download | pango-411bd8c907fbf018a8d7529b6a858a8c11f87bd3.tar.gz | |
Add an --enable-debug configure argument defaulting to 'yes' for unstable
Mon Feb 17 13:06:39 2003 Owen Taylor <otaylor@redhat.com>
* configure.in **/Makefile.am: Add an --enable-debug
configure argument defaulting to 'yes' for unstable
releases and 'minimum' for stable releases.
For minimum, -DG_DISABLE_CAST_CHECKS.
* pango/pangofc-fontmap.cI pango/pangoft2-fontmap.c
pango/pangoxft-fontmap.c: Add caching of fontsets
(#104495, initial patch and review by Soeren Sandmann)
* pango/pangofc-fontmap.cI pango/pangoft2-fontmap.c
pango/pangoxft-fontmap.c pango/pangoft2-private.h
pango/pangoxft-private.h: Remove cache of recently freed
fonts; not necessary now that we cache fontsets.
* pango/pangofc-fontmap.cI (pango_fc_pattern_set_free):
Rename from pango_fc_font_set_free to reflect
what it actually does.
* pango/pangofc-fontmap.cI pango/pangoft-fontmap.c
pango/pangoxft-fontmap.c: Combine clear-the-cache
functions; we didn't need separate clear-the-font-cache
and clear-the-pattern-cache functions.
Diffstat (limited to 'pango/pangoxft-font.c')
| -rw-r--r-- | pango/pangoxft-font.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/pango/pangoxft-font.c b/pango/pangoxft-font.c index addc27e4..262cbb05 100644 --- a/pango/pangoxft-font.c +++ b/pango/pangoxft-font.c @@ -53,7 +53,6 @@ static PangoFontClass *parent_class; /* Parent class structure for PangoXftFont static void pango_xft_font_class_init (PangoXftFontClass *class); static void pango_xft_font_init (PangoXftFont *xfont); -static void pango_xft_font_dispose (GObject *object); static void pango_xft_font_finalize (GObject *object); static PangoFontDescription *pango_xft_font_describe (PangoFont *font); @@ -103,7 +102,6 @@ static void pango_xft_font_init (PangoXftFont *xfont) { xfont->metrics_by_lang = NULL; - xfont->in_cache = FALSE; } static void @@ -115,7 +113,6 @@ pango_xft_font_class_init (PangoXftFontClass *class) parent_class = g_type_class_peek_parent (class); object_class->finalize = pango_xft_font_finalize; - object_class->dispose = pango_xft_font_dispose; font_class->describe = pango_xft_font_describe; font_class->get_coverage = pango_xft_font_get_coverage; @@ -495,21 +492,6 @@ pango_xft_font_get_metrics (PangoFont *font, } static void -pango_xft_font_dispose (GObject *object) -{ - PangoXftFont *xfont = PANGO_XFT_FONT (object); - - /* If the font is not already in the freed-fonts cache, add it, - * if it is already there, do nothing and the font will be - * freed. - */ - if (!xfont->in_cache && xfont->fontmap) - _pango_xft_font_map_cache_add (xfont->fontmap, xfont); - - G_OBJECT_CLASS (parent_class)->dispose (object); -} - -static void free_metrics_info (PangoXftMetricsInfo *info) { pango_font_metrics_unref (info->metrics); |