diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-04-11 11:56:26 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-04-11 11:56:26 +0400 |
| commit | 8f2a7cde6d3b0c667ce53bba3f585a837b0123b2 (patch) | |
| tree | 456d90743b95ce4796247aa3a1a067399b7a6111 /source/blender/blenfont | |
| parent | b7b4f94e782f7e74c5acf0af19dfda07fdd92568 (diff) | |
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.
Diffstat (limited to 'source/blender/blenfont')
| -rw-r--r-- | source/blender/blenfont/intern/blf_font.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) \ |