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

Merge commit '1ea60c472c21db87f07cd81c4df440046a907cfd' into harfbuzz

Browse source 
Conflicts:
	include/mapnik/font_engine_freetype.hpp
	src/font_engine_freetype.cpp
This commit is contained in:
Hermann Kraus 2013-03-16 18:13:37 +01:00
commit 59f2d776b4
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/font_engine_freetype.cpp
View file

@ -226,6 +226,7 @@ face_ptr face_manager<T>::get_face(const std::string &name)
face_ptr_cache_type::iterator itr; face_ptr_cache_type::iterator itr;
itr = face_ptr_cache_.find(name); itr = face_ptr_cache_.find(name);
if (itr != face_ptr_cache_.end()) if (itr != face_ptr_cache_.end())
{
{ {
return itr->second; return itr->second;
} }