summaryrefslogtreecommitdiff
path: root/pango/pangoft2.c
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2003-02-17 22:04:29 +0000
committerOwen Taylor <otaylor@src.gnome.org>2003-02-17 22:04:29 +0000
commit411bd8c907fbf018a8d7529b6a858a8c11f87bd3 (patch)
tree12408b3fbbaaca409e202dab63eecc3e5e2c8712 /pango/pangoft2.c
parent837fdf20fad1c7d3302f5ccf2fb9eada57a6067d (diff)
downloadpango-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/pangoft2.c')
-rw-r--r--pango/pangoft2.c18
1 files changed, 0 insertions, 18 deletions
diff --git a/pango/pangoft2.c b/pango/pangoft2.c
index 72f4cd1c..7428bb1a 100644
--- a/pango/pangoft2.c
+++ b/pango/pangoft2.c
@@ -66,7 +66,6 @@ static PangoFontClass *parent_class; /* Parent class structure for PangoFT2Font
static void pango_ft2_font_class_init (PangoFT2FontClass *class);
static void pango_ft2_font_init (PangoFT2Font *ft2font);
-static void pango_ft2_font_dispose (GObject *object);
static void pango_ft2_font_finalize (GObject *object);
static PangoFontDescription *pango_ft2_font_describe (PangoFont *font);
@@ -315,7 +314,6 @@ pango_ft2_font_class_init (PangoFT2FontClass *class)
parent_class = g_type_class_peek_parent (class);
object_class->finalize = pango_ft2_font_finalize;
- object_class->dispose = pango_ft2_font_dispose;
font_class->describe = pango_ft2_font_describe;
font_class->get_coverage = pango_ft2_font_get_coverage;
@@ -668,22 +666,6 @@ pango_ft2_font_get_metrics (PangoFont *font,
return pango_font_metrics_ref (info->metrics);
}
-static void
-pango_ft2_font_dispose (GObject *object)
-{
- PangoFT2Font *ft2font = PANGO_FT2_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 (!ft2font->in_cache && ft2font->fontmap)
- _pango_ft2_font_map_cache_add (ft2font->fontmap, ft2font);
-
- G_OBJECT_CLASS (parent_class)->dispose (object);
-}
-
-
static gboolean
pango_ft2_free_glyph_info_callback (gpointer key, gpointer value, gpointer data)
{