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/pangoft2.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/pangoft2.c')
| -rw-r--r-- | pango/pangoft2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pango/pangoft2.c b/pango/pangoft2.c index b286f906..b6467981 100644 --- a/pango/pangoft2.c +++ b/pango/pangoft2.c @@ -64,7 +64,7 @@ static void pango_ft2_font_get_glyph_extents (PangoFont *font, PangoRectangle *ink_rect, PangoRectangle *logical_rect); -static gpointer pango_ft2_font_real_lock_face (PangoFcFont *font); +static FT_Face pango_ft2_font_real_lock_face (PangoFcFont *font); static void pango_ft2_font_real_unlock_face (PangoFcFont *font); @@ -430,7 +430,7 @@ pango_ft2_font_get_kerning (PangoFont *font, return PANGO_UNITS_26_6 (kerning.x); } -static gpointer +static FT_Face pango_ft2_font_real_lock_face (PangoFcFont *font) { return pango_ft2_font_get_face ((PangoFont *)font); |