[pango/kill-ft-face: 6/8] Drop an unused function
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pango/kill-ft-face: 6/8] Drop an unused function
- Date: Wed, 10 Jul 2019 04:22:09 +0000 (UTC)
commit 4f8aed4f1493d62ee1a6fef3645c040502d745b5
Author: Matthias Clasen <mclasen redhat com>
Date: Thu Jul 4 16:58:37 2019 +0000
Drop an unused function
We don't use _pango_cairo_fc_font_map_get_library
anymore.
pango/pangocairo-fc-private.h | 3 ---
pango/pangocairo-fcfontmap.c | 29 -----------------------------
2 files changed, 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
@@ -98,16 +98,6 @@ cairo_font_map_iface_init (PangoCairoFontMapIface *iface)
G_DEFINE_TYPE_WITH_CODE (PangoCairoFcFontMap, pango_cairo_fc_font_map, PANGO_TYPE_FC_FONT_MAP,
{ 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,
@@ -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;
-}
-
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]