From 0baad0af624906ba11612a97bb00a20b8d8bad4b Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 22 Aug 2019 09:34:41 +0200 Subject: Move a few fc functions back to public headers These are meant to be public. --- pango/pangofc-fontmap-private.h | 7 ------- pango/pangofc-fontmap.h | 8 ++++++++ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pango/pangofc-fontmap-private.h b/pango/pangofc-fontmap-private.h index 4d8d8c59..131f7266 100644 --- a/pango/pangofc-fontmap-private.h +++ b/pango/pangofc-fontmap-private.h @@ -181,13 +181,6 @@ struct _PangoFcFontMapClass void (*_pango_reserved4) (void); }; -#ifndef PANGO_DISABLE_DEPRECATED -PANGO_DEPRECATED_IN_1_22_FOR(pango_font_map_create_context) -PangoContext * pango_fc_font_map_create_context (PangoFcFontMap *fcfontmap); -#endif -PANGO_AVAILABLE_IN_1_4 -void pango_fc_font_map_shutdown (PangoFcFontMap *fcfontmap); - G_END_DECLS diff --git a/pango/pangofc-fontmap.h b/pango/pangofc-fontmap.h index 495adc52..ae11ec31 100644 --- a/pango/pangofc-fontmap.h +++ b/pango/pangofc-fontmap.h @@ -87,6 +87,14 @@ PANGO_AVAILABLE_IN_1_4 PangoFontDescription *pango_fc_font_description_from_pattern (FcPattern *pattern, gboolean include_size); +#ifndef PANGO_DISABLE_DEPRECATED +PANGO_DEPRECATED_IN_1_22_FOR(pango_font_map_create_context) +PangoContext * pango_fc_font_map_create_context (PangoFcFontMap *fcfontmap); +#endif +PANGO_AVAILABLE_IN_1_4 +void pango_fc_font_map_shutdown (PangoFcFontMap *fcfontmap); + + PANGO_AVAILABLE_IN_1_44 hb_face_t * pango_fc_font_map_get_hb_face (PangoFcFontMap *fcfontmap, PangoFcFont *fcfont); -- cgit v1.2.1