diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2019-08-06 12:56:02 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2019-08-06 12:56:02 -0400 |
| commit | 5af6340eef9833f0f8e878939e88d98b11813578 (patch) | |
| tree | 8ff5a1b362c8f13b58b04bd1cb34e13f0d3edabc /pango/pangofc-font.h | |
| parent | 22dfeef4a26984ba81c6ff30117017dac372b706 (diff) | |
| download | pango-5af6340eef9833f0f8e878939e88d98b11813578.tar.gz | |
Reinstate the return type of pango_fc_font_lock_face()
We did not remove the freetype dependency from libpango
anyway, so bite the bullet, and keep including freetype
headers.
Changing the return type to gpointer broke C++ users,
where casts from void* are not automatic.
Diffstat (limited to 'pango/pangofc-font.h')
| -rw-r--r-- | pango/pangofc-font.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pango/pangofc-font.h b/pango/pangofc-font.h index a7c5f87d..0cd4f174 100644 --- a/pango/pangofc-font.h +++ b/pango/pangofc-font.h @@ -32,6 +32,8 @@ #pragma GCC diagnostic ignored "-Wundef" #endif +#include <ft2build.h> +#include FT_FREETYPE_H #include <fontconfig/fontconfig.h> #ifdef PANGO_COMPILATION @@ -64,7 +66,7 @@ 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); +FT_Face pango_fc_font_lock_face (PangoFcFont *font); PANGO_DEPRECATED_IN_1_44_FOR(pango_font_get_hb_font) void pango_fc_font_unlock_face (PangoFcFont *font); |