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/pangoxft-font.c | |
| 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/pangoxft-font.c')
| -rw-r--r-- | pango/pangoxft-font.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pango/pangoxft-font.c b/pango/pangoxft-font.c index 779eb886..2526b13d 100644 --- a/pango/pangoxft-font.c +++ b/pango/pangoxft-font.c @@ -75,7 +75,7 @@ static void pango_xft_font_get_glyph_extents (PangoFont PangoRectangle *ink_rect, PangoRectangle *logical_rect); -static gpointer pango_xft_font_real_lock_face (PangoFcFont *font); +static FT_Face pango_xft_font_real_lock_face (PangoFcFont *font); static void pango_xft_font_real_unlock_face (PangoFcFont *font); static gboolean pango_xft_font_real_has_char (PangoFcFont *font, gunichar wc); @@ -449,12 +449,12 @@ xft_font_get_font (PangoFont *font) return xfont->xft_font; } -static gpointer +static FT_Face pango_xft_font_real_lock_face (PangoFcFont *font) { XftFont *xft_font = xft_font_get_font ((PangoFont *)font); - return (gpointer)XftLockFace (xft_font); + return XftLockFace (xft_font); } static void |