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

+ fix memory font loading

Browse source
This commit is contained in:
artemp 2013-04-11 10:57:33 +01:00
parent 5de4636be8
commit 37b74f1e15
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/font_engine_freetype.cpp
View file

@ -177,8 +177,8 @@ bool freetype_engine::register_fonts(std::string const& dir, bool recurse)
std::string base_name = itr->filename(); std::string base_name = itr->filename();
#endif #endif
if (!boost::algorithm::starts_with(base_name,".") && if (!boost::algorithm::starts_with(base_name,".") &&
boost::filesystem::is_regular_file(file_name) && boost::filesystem::is_regular_file(file_name) &&
is_font_file(file_name)) is_font_file(file_name))
{ {
if (mapnik::freetype_engine::register_font(file_name)) if (mapnik::freetype_engine::register_font(file_name))
{ {
@ -231,19 +231,25 @@ face_ptr freetype_engine::create_face(std::string const& family_name)
else else
{ {
// load font into memory // load font into memory
#ifdef MAPNIK_THREADSAFE
mutex::scoped_lock lock(mutex_);
#endif
std::ifstream is(itr->second.second.c_str() , std::ios::binary); std::ifstream is(itr->second.second.c_str() , std::ios::binary);
std::string buffer((std::istreambuf_iterator<char>(is)), std::string buffer((std::istreambuf_iterator<char>(is)),
std::istreambuf_iterator<char>()); std::istreambuf_iterator<char>());
std::pair<std::map<std::string,std::string>::iterator,bool> result
= memory_fonts_.insert(std::make_pair(itr->second.second, buffer));
FT_Error error = FT_New_Memory_Face (library_, FT_Error error = FT_New_Memory_Face (library_,
(FT_Byte const*) buffer.c_str(), (FT_Byte const*) result.first->second.c_str(),
buffer.size(), buffer.size(),
itr->second.first, itr->second.first,
&face); &face);
if (!error) if (!error) return boost::make_shared<font_face>(face);
else
{ {
memory_fonts_.insert(std::make_pair(itr->second.second, buffer)); // we can't load font, erase it.
return boost::make_shared<font_face>(face); memory_fonts_.erase(result.first);
} }
} }
} }