Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: Client exit on unicode composite character errors

Browse source 
--HG--
branch : develop
This commit is contained in:
Nimetu 2017-11-20 16:00:51 +02:00
parent c4b9b0eb58
commit b00d62d4ce
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
code/nel/src/3d/font_generator.cpp
View file

@ -271,7 +271,14 @@ void CFontGenerator::getSizes (ucchar c, uint32 size, uint32 &width, uint32 &hei
error = FT_Load_Glyph (_Face, glyph_index, FT_LOAD_DEFAULT); error = FT_Load_Glyph (_Face, glyph_index, FT_LOAD_DEFAULT);
if (error) if (error)
{ {
nlerror ("FT_Load_Glyph() failed: %s", getFT2Error(error)); // use fallback for glyph/character errors (composite char limit for example)
nlwarning ("FT_Load_Glyph() failed: %s", getFT2Error(error));
error = FT_Load_Glyph (_Face, 0, FT_LOAD_DEFAULT);
if (error)
{
nlerror("FT_Load_Glyph() fallback failed: %s", getFT2Error(error));
}
} }
// convert 24.6 fixed point into integer // convert 24.6 fixed point into integer
@ -302,7 +309,14 @@ uint8 *CFontGenerator::getBitmap (ucchar c, uint32 size, bool embolden, bool obl
error = FT_Load_Glyph (_Face, glyph_index, FT_LOAD_DEFAULT); error = FT_Load_Glyph (_Face, glyph_index, FT_LOAD_DEFAULT);
if (error) if (error)
{ {
nlerror ("FT_Load_Glyph() failed: %s", getFT2Error(error)); // use fallback for glyph/character errors (composite char limit for example)
nlwarning ("FT_Load_Glyph() failed: %s", getFT2Error(error));
error = FT_Load_Glyph (_Face, 0, FT_LOAD_DEFAULT);
if (error)
{
nlerror("FT_Load_Glyph() fallback failed: %s", getFT2Error(error));
}
} }
if (size == 0) if (size == 0)