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

skip font files and face names with leading '.' - interpret as hidden

Browse source
This commit is contained in:
Dane Springmeyer 2012-04-20 15:31:06 -07:00
parent 904c294e8f
commit 622ce7e590
1 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/font_engine_freetype.cpp
View file

@ -102,9 +102,13 @@ bool freetype_engine::register_font(std::string const& file_name)
// http://www.freetype.org/freetype2/docs/reference/ft2-base_interface.html#FT_FaceRec // http://www.freetype.org/freetype2/docs/reference/ft2-base_interface.html#FT_FaceRec
if (face->family_name && face->style_name) if (face->family_name && face->style_name)
{ {
success = true;
std::string name = std::string(face->family_name) + " " + std::string(face->style_name); std::string name = std::string(face->family_name) + " " + std::string(face->style_name);
name2file_.insert(std::make_pair(name, std::make_pair(i,file_name))); // skip fonts with leading . in name
if (!boost::algorithm::starts_with(name,"."))
{
success = true;
name2file_.insert(std::make_pair(name, std::make_pair(i,file_name)));
}
} }
else else
{ {
@ -150,9 +154,19 @@ bool freetype_engine::register_fonts(std::string const& dir, bool recurse)
{ {
success = register_fonts(file_name, true); success = register_fonts(file_name, true);
} }
else if (boost::filesystem::is_regular_file(file_name) && is_font_file(file_name)) else
{ {
success = mapnik::freetype_engine::register_font(file_name); #if (BOOST_FILESYSTEM_VERSION == 3)
std::string const& base_name = itr->path().filename().string();
#else // v2
std::string const& base_name = itr->filename().string();
#endif
if (!boost::algorithm::starts_with(base_name,".") &&
boost::filesystem::is_regular_file(file_name) &&
is_font_file(file_name))
{
success = mapnik::freetype_engine::register_font(file_name);
}
} }
} }
return success; return success;