[Bf-blender-cvs] [8f2a7cd] master: Fix compilation error after recent BLF change

Sergey Sharybin noreply at git.blender.org
Fri Apr 11 09:57:26 CEST 2014


Commit: 8f2a7cde6d3b0c667ce53bba3f585a837b0123b2
Author: Sergey Sharybin
Date:   Fri Apr 11 13:56:26 2014 +0600
https://developer.blender.org/rB8f2a7cde6d3b0c667ce53bba3f585a837b0123b2

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.

===================================================================

M	source/blender/blenfont/intern/blf_font.c

===================================================================

diff --git a/source/blender/blenfont/intern/blf_font.c b/source/blender/blenfont/intern/blf_font.c
index a06f4a2..b9d1669 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)         \




More information about the Bf-blender-cvs mailing list