From 8f2a7cde6d3b0c667ce53bba3f585a837b0123b2 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 11 Apr 2014 13:56:26 +0600 Subject: Fix compilation error after recent BLF change FT headers seems to be inconsistent here, FT_KERNING_UNFITTED is defined as an enum element, but FT_Get_Kerning expects UInt. Just case for now. --- source/blender/blenfont/intern/blf_font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/blenfont') diff --git a/source/blender/blenfont/intern/blf_font.c b/source/blender/blenfont/intern/blf_font.c index a06f4a2c6d9..b9d1669484b 100644 --- a/source/blender/blenfont/intern/blf_font.c +++ b/source/blender/blenfont/intern/blf_font.c @@ -153,7 +153,7 @@ static void blf_font_ensure_ascii_table(FontBLF *font) const bool _has_kerning = FT_HAS_KERNING((_font)->face); \ const FT_UInt _kern_mode = (_has_kerning == 0) ? 0 : \ (((_font)->flags & BLF_KERNING_DEFAULT) ? \ - ft_kerning_default : FT_KERNING_UNFITTED) \ + ft_kerning_default : (FT_UInt)FT_KERNING_UNFITTED) \ #define BLF_KERNING_STEP(_font, _kern_mode, _g_prev, _g, _delta, _pen_x) \ -- cgit v1.2.3