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

Merge commit 'cdee64709b8d344412b2de8015621dad45e8255c' into harfbuzz

Browse source 
Conflicts:
	src/font_engine_freetype.cpp
This commit is contained in:
Hermann Kraus 2013-03-16 18:19:58 +01:00
commit e1ca065be4
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/font_engine_freetype.cpp
View file

@ -50,7 +50,7 @@ freetype_engine::~freetype_engine()
bool freetype_engine::is_font_file(std::string const& file_name) bool freetype_engine::is_font_file(std::string const& file_name)
{ {
/** only accept files that will be matched by freetype2's `figurefiletype()` */ // only accept files that will be matched by freetype2's `figurefiletype()`
std::string fn = file_name; std::string fn = file_name;
std::transform(fn.begin(), fn.end(), fn.begin(), ::tolower); std::transform(fn.begin(), fn.end(), fn.begin(), ::tolower);
return boost::algorithm::ends_with(fn,std::string(".ttf")) || return boost::algorithm::ends_with(fn,std::string(".ttf")) ||
@ -59,7 +59,7 @@ bool freetype_engine::is_font_file(std::string const& file_name)
boost::algorithm::ends_with(fn,std::string(".pfa")) || boost::algorithm::ends_with(fn,std::string(".pfa")) ||
boost::algorithm::ends_with(fn,std::string(".pfb")) || boost::algorithm::ends_with(fn,std::string(".pfb")) ||
boost::algorithm::ends_with(fn,std::string(".ttc")) || boost::algorithm::ends_with(fn,std::string(".ttc")) ||
/** Plus OSX custom ext */ // Plus OSX custom ext
boost::algorithm::ends_with(fn,std::string(".dfont")); boost::algorithm::ends_with(fn,std::string(".dfont"));
} }