mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-11-25 04:41:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix for fonts with no kerning tables

Browse Source 
Apply deltas even if the font has no kerning table
This commit is contained in:
Radek Dutkiewicz 2020-03-08 16:21:42 +00:00 committed by Lukas Dürrenberger
parent 7a0c35c334
commit f76f0607c7
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/SFML/Graphics/Font.cpp
View File

@ -384,7 +384,7 @@ float Font::getKerning(Uint32 first, Uint32 second, unsigned int characterSize)
FT_Face face = static_cast<FT_Face>(m_face); FT_Face face = static_cast<FT_Face>(m_face);
if (face && FT_HAS_KERNING(face) && setCurrentSize(characterSize)) if (face && setCurrentSize(characterSize))
{ {
// Convert the characters to indices // Convert the characters to indices
FT_UInt index1 = FT_Get_Char_Index(face, first); FT_UInt index1 = FT_Get_Char_Index(face, first);
@ -396,7 +396,8 @@ float Font::getKerning(Uint32 first, Uint32 second, unsigned int characterSize)
// Get the kerning vector // Get the kerning vector
FT_Vector kerning; FT_Vector kerning;
FT_Get_Kerning(face, index1, index2, FT_KERNING_UNFITTED, &kerning); if( FT_HAS_KERNING(face))
FT_Get_Kerning(face, index1, index2, FT_KERNING_UNFITTED, &kerning);
// X advance is already in pixels for bitmap fonts // X advance is already in pixels for bitmap fonts
if (!FT_IS_SCALABLE(face)) if (!FT_IS_SCALABLE(face))