sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

call FT_Done_Face for matching FT_Open_Face

Browse source
This commit is contained in:
artemp 2014-06-24 11:21:01 +01:00
parent f4acd06f84
commit 68775c52ff
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/font_engine_freetype.cpp
View file

@ -158,13 +158,11 @@ bool freetype_engine::register_font_impl(std::string const& file_name, FT_Librar
// some font files have multiple fonts in a file // some font files have multiple fonts in a file
// the count is in the 'root' face library[0] // the count is in the 'root' face library[0]
// see the FT_FaceRec in freetype.h // see the FT_FaceRec in freetype.h
for ( int i = 0; face == 0 || i < num_faces; i++ ) { for ( int i = 0; face == 0 || i < num_faces; ++i )
{
// if face is null then this is the first face // if face is null then this is the first face
FT_Error error = FT_Open_Face(library, &args, i, &face); FT_Error error = FT_Open_Face(library, &args, i, &face);
if (error) if (error) break;
{
break;
}
// store num_faces locally, after FT_Done_Face it can not be accessed any more // store num_faces locally, after FT_Done_Face it can not be accessed any more
if (!num_faces) if (!num_faces)
num_faces = face->num_faces; num_faces = face->num_faces;
@ -193,10 +191,8 @@ bool freetype_engine::register_font_impl(std::string const& file_name, FT_Librar
MAPNIK_LOG_ERROR(font_engine_freetype) << "register_font: " << s.str(); MAPNIK_LOG_ERROR(font_engine_freetype) << "register_font: " << s.str();
} }
}
if (face) FT_Done_Face(face); if (face) FT_Done_Face(face);
}
return success; return success;
} }