diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2019-08-01 11:55:26 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2019-08-01 11:55:26 +0000 |
| commit | f32f1bf71e58d72dae8a694fa8ba683a3be77da0 (patch) | |
| tree | 54a4b72d6655fe3f9fb2a143bde4e6d6c4a7130f | |
| parent | f837fa09e3c0a47456d60c0754909cec1b11b13b (diff) | |
| parent | 51de6323c8def137688ca7568af287c2bcd8e786 (diff) | |
| download | pango-f32f1bf71e58d72dae8a694fa8ba683a3be77da0.tar.gz | |
Merge branch 'pangofc-api' into 'master'
Keep deprecated pango_fc apis in pango-fc-font.h
Closes #394
See merge request GNOME/pango!113
| -rw-r--r-- | pango/pangofc-font-private.h | 15 | ||||
| -rw-r--r-- | pango/pangofc-font.h | 15 |
2 files changed, 15 insertions, 15 deletions
diff --git a/pango/pangofc-font-private.h b/pango/pangofc-font-private.h index 91f89207..0f538bb7 100644 --- a/pango/pangofc-font-private.h +++ b/pango/pangofc-font-private.h @@ -22,7 +22,6 @@ #ifndef __PANGO_FC_FONT_PRIVATE_H__ #define __PANGO_FC_FONT_PRIVATE_H__ -#include <pango/pango-glyph.h> #include <pango/pangofc-font.h> #include <pango/pango-font-private.h> @@ -128,19 +127,5 @@ struct _PangoFcFontClass }; -PANGO_DEPRECATED_IN_1_44 -gboolean pango_fc_font_has_char (PangoFcFont *font, - gunichar wc); -PANGO_AVAILABLE_IN_1_4 -guint pango_fc_font_get_glyph (PangoFcFont *font, - gunichar wc); -PANGO_DEPRECATED_FOR(PANGO_GET_UNKNOWN_GLYPH) -PangoGlyph pango_fc_font_get_unknown_glyph (PangoFcFont *font, - gunichar wc); -PANGO_DEPRECATED_IN_1_32 -void pango_fc_font_kern_glyphs (PangoFcFont *font, - PangoGlyphString *glyphs); - - G_END_DECLS #endif /* __PANGO_FC_FONT_PRIVATE_H__ */ diff --git a/pango/pangofc-font.h b/pango/pangofc-font.h index fc6ee529..a7c5f87d 100644 --- a/pango/pangofc-font.h +++ b/pango/pangofc-font.h @@ -22,7 +22,9 @@ #ifndef __PANGO_FC_FONT_H__ #define __PANGO_FC_FONT_H__ +#include <pango/pango-glyph.h> #include <pango/pango-font.h> +#include <pango/pango-glyph.h> /* Freetype has undefined macros in its header */ #ifdef PANGO_COMPILATION @@ -48,6 +50,19 @@ typedef struct _PangoFcFontClass PangoFcFontClass; PANGO_AVAILABLE_IN_ALL GType pango_fc_font_get_type (void) G_GNUC_CONST; +PANGO_DEPRECATED_IN_1_44 +gboolean pango_fc_font_has_char (PangoFcFont *font, + gunichar wc); +PANGO_AVAILABLE_IN_1_4 +guint pango_fc_font_get_glyph (PangoFcFont *font, + gunichar wc); +PANGO_DEPRECATED_FOR(PANGO_GET_UNKNOWN_GLYPH) +PangoGlyph pango_fc_font_get_unknown_glyph (PangoFcFont *font, + gunichar wc); +PANGO_DEPRECATED_IN_1_32 +void pango_fc_font_kern_glyphs (PangoFcFont *font, + PangoGlyphString *glyphs); + PANGO_DEPRECATED_IN_1_44_FOR(pango_font_get_hb_font) gpointer pango_fc_font_lock_face (PangoFcFont *font); PANGO_DEPRECATED_IN_1_44_FOR(pango_font_get_hb_font) |