caiyu/solvespace
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix a handle leak in TtfFontList::PlotString.

Browse Source
This commit is contained in:
whitequark 2016-10-10 21:16:22 +00:00
parent 476860acbb
commit 66ed417d45
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ttf.cpp
View File

@ -88,7 +88,9 @@ void TtfFontList::PlotString(const std::string &font, const std::string &str,
[&](const TtfFont &tf) { return tf.FontFileBaseName() == font; }); [&](const TtfFont &tf) { return tf.FontFileBaseName() == font; });
if(!str.empty() && tf != &l.elem[l.n]) { if(!str.empty() && tf != &l.elem[l.n]) {
if(tf->fontFace == NULL) {
tf->LoadFromFile(fontLibrary, /*nameOnly=*/false); tf->LoadFromFile(fontLibrary, /*nameOnly=*/false);
}
tf->PlotString(str, sbl, origin, u, v); tf->PlotString(str, sbl, origin, u, v);
} else { } else {
// No text or no font; so draw a big X for an error marker. // No text or no font; so draw a big X for an error marker.
@ -135,6 +137,7 @@ bool TtfFont::LoadFromFile(FT_Library fontLibrary, bool nameOnly) {
dbp("freetype: loading unicode CMap for file '%s' failed: %s", dbp("freetype: loading unicode CMap for file '%s' failed: %s",
fontFile.c_str(), ft_error_string(fterr)); fontFile.c_str(), ft_error_string(fterr));
FT_Done_Face(fontFace); FT_Done_Face(fontFace);
fontFace = NULL;
return false; return false;
} }