summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2019-07-04 16:58:37 +0000
committerMatthias Clasen <mclasen@redhat.com>2019-07-12 00:09:37 -0400
commit24fe412b530c11865195b8b36688f39d55d3c341 (patch)
tree57cdf6d1706d930ba56079a496564dd80538687f
parent7501b4ecffb22e0d34c6663646f740725711a350 (diff)
downloadpango-24fe412b530c11865195b8b36688f39d55d3c341.tar.gz
Drop an unused function
We don't use _pango_cairo_fc_font_map_get_library anymore.
-rw-r--r--pango/pangocairo-fc-private.h3
-rw-r--r--pango/pangocairo-fcfontmap.c29
2 files changed, 0 insertions, 32 deletions
diff --git a/pango/pangocairo-fc-private.h b/pango/pangocairo-fc-private.h
index fc0193e4..370ecbea 100644
--- a/pango/pangocairo-fc-private.h
+++ b/pango/pangocairo-fc-private.h
@@ -33,14 +33,11 @@ struct _PangoCairoFcFontMap
guint serial;
double dpi;
-
- FT_Library library;
};
PangoFcFont *_pango_cairo_fc_font_new (PangoCairoFcFontMap *cffontmap,
PangoFcFontKey *key);
-FT_Library _pango_cairo_fc_font_map_get_library (PangoCairoFcFontMap *fontmap);
G_END_DECLS
diff --git a/pango/pangocairo-fcfontmap.c b/pango/pangocairo-fcfontmap.c
index 957cfdb3..bd3a8583 100644
--- a/pango/pangocairo-fcfontmap.c
+++ b/pango/pangocairo-fcfontmap.c
@@ -99,16 +99,6 @@ G_DEFINE_TYPE_WITH_CODE (PangoCairoFcFontMap, pango_cairo_fc_font_map, PANGO_TYP
{ G_IMPLEMENT_INTERFACE (PANGO_TYPE_CAIRO_FONT_MAP, cairo_font_map_iface_init) })
static void
-pango_cairo_fc_font_map_finalize (GObject *object)
-{
- PangoCairoFcFontMap *cffontmap = (PangoCairoFcFontMap *) (object);
-
- G_OBJECT_CLASS (pango_cairo_fc_font_map_parent_class)->finalize (object);
-
- FT_Done_FreeType (cffontmap->library);
-}
-
-static void
pango_cairo_fc_font_map_fontset_key_substitute (PangoFcFontMap *fcfontmap G_GNUC_UNUSED,
PangoFcFontsetKey *fontkey,
FcPattern *pattern)
@@ -190,12 +180,9 @@ pango_cairo_fc_font_map_create_font (PangoFcFontMap *fcfontmap,
static void
pango_cairo_fc_font_map_class_init (PangoCairoFcFontMapClass *class)
{
- GObjectClass *gobject_class = G_OBJECT_CLASS (class);
PangoFontMapClass *fontmap_class = PANGO_FONT_MAP_CLASS (class);
PangoFcFontMapClass *fcfontmap_class = PANGO_FC_FONT_MAP_CLASS (class);
- gobject_class->finalize = pango_cairo_fc_font_map_finalize;
-
fontmap_class->get_serial = pango_cairo_fc_font_map_get_serial;
fontmap_class->changed = pango_cairo_fc_font_map_changed;
@@ -214,22 +201,6 @@ pango_cairo_fc_font_map_class_init (PangoCairoFcFontMapClass *class)
static void
pango_cairo_fc_font_map_init (PangoCairoFcFontMap *cffontmap)
{
- FT_Error error;
-
- cffontmap->library = NULL;
- error = FT_Init_FreeType (&cffontmap->library);
- if (error != FT_Err_Ok)
- g_critical ("pango_cairo_font_map_init: Could not initialize freetype");
-
cffontmap->serial = 1;
cffontmap->dpi = 96.0;
}
-
-FT_Library
-_pango_cairo_fc_font_map_get_library (PangoCairoFcFontMap *fontmap)
-{
- g_return_val_if_fail (PANGO_IS_CAIRO_FC_FONT_MAP (fontmap), NULL);
-
- return fontmap->library;
-}
-