mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2025-01-19 15:55:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed slight memory leak in sf::Font

Browse Source
This commit is contained in:
Dermoumi S 2017-04-07 09:22:18 +01:00 committed by Lukas Dürrenberger
parent 700fc7d9e0
commit c43b5991af
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -151,19 +151,21 @@ bool Font::loadFromFile(const std::string& filename)
if (FT_Stroker_New(static_cast<FT_Library>(m_library), &stroker) != 0) if (FT_Stroker_New(static_cast<FT_Library>(m_library), &stroker) != 0)
{ {
err() << "Failed to load font \"" << filename << "\" (failed to create the stroker)" << std::endl; err() << "Failed to load font \"" << filename << "\" (failed to create the stroker)" << std::endl;
FT_Done_Face(face);
return false; return false;
} }
m_stroker = stroker;
// Select the unicode character map // Select the unicode character map
if (FT_Select_Charmap(face, FT_ENCODING_UNICODE) != 0) if (FT_Select_Charmap(face, FT_ENCODING_UNICODE) != 0)
{ {
err() << "Failed to load font \"" << filename << "\" (failed to set the Unicode character set)" << std::endl; err() << "Failed to load font \"" << filename << "\" (failed to set the Unicode character set)" << std::endl;
FT_Stroker_Done(stroker);
FT_Done_Face(face); FT_Done_Face(face);
return false; return false;
} }
// Store the loaded font in our ugly void* :) // Store the loaded font in our ugly void* :)
m_stroker = stroker;
m_face = face; m_face = face;
// Store the font information // Store the font information
@ -214,19 +216,21 @@ bool Font::loadFromMemory(const void* data, std::size_t sizeInBytes)
if (FT_Stroker_New(static_cast<FT_Library>(m_library), &stroker) != 0) if (FT_Stroker_New(static_cast<FT_Library>(m_library), &stroker) != 0)
{ {
err() << "Failed to load font from memory (failed to create the stroker)" << std::endl; err() << "Failed to load font from memory (failed to create the stroker)" << std::endl;
FT_Done_Face(face);
return false; return false;
} }
m_stroker = stroker;
// Select the Unicode character map // Select the Unicode character map
if (FT_Select_Charmap(face, FT_ENCODING_UNICODE) != 0) if (FT_Select_Charmap(face, FT_ENCODING_UNICODE) != 0)
{ {
err() << "Failed to load font from memory (failed to set the Unicode character set)" << std::endl; err() << "Failed to load font from memory (failed to set the Unicode character set)" << std::endl;
FT_Stroker_Done(stroker);
FT_Done_Face(face); FT_Done_Face(face);
return false; return false;
} }
// Store the loaded font in our ugly void* :) // Store the loaded font in our ugly void* :)
m_stroker = stroker;
m_face = face; m_face = face;
// Store the font information // Store the font information
@ -287,20 +291,23 @@ bool Font::loadFromStream(InputStream& stream)
if (FT_Stroker_New(static_cast<FT_Library>(m_library), &stroker) != 0) if (FT_Stroker_New(static_cast<FT_Library>(m_library), &stroker) != 0)
{ {
err() << "Failed to load font from stream (failed to create the stroker)" << std::endl; err() << "Failed to load font from stream (failed to create the stroker)" << std::endl;
FT_Done_Face(face);
delete rec;
return false; return false;
} }
m_stroker = stroker;
// Select the Unicode character map // Select the Unicode character map
if (FT_Select_Charmap(face, FT_ENCODING_UNICODE) != 0) if (FT_Select_Charmap(face, FT_ENCODING_UNICODE) != 0)
{ {
err() << "Failed to load font from stream (failed to set the Unicode character set)" << std::endl; err() << "Failed to load font from stream (failed to set the Unicode character set)" << std::endl;
FT_Done_Face(face); FT_Done_Face(face);
FT_Stroker_Done(stroker);
delete rec; delete rec;
return false; return false;
} }
// Store the loaded font in our ugly void* :) // Store the loaded font in our ugly void* :)
m_stroker = stroker;
m_face = face; m_face = face;
m_streamRec = rec; m_streamRec = rec;