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

avoid taking reference to temporary - fixes segfaul seen on linux (but not on osx)

Browse source
This commit is contained in:
Dane Springmeyer 2012-04-23 21:28:07 -04:00
parent 3ded9e06bd
commit 6a27a28de2
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/font_engine_freetype.cpp
View file

@ -146,9 +146,9 @@ bool freetype_engine::register_fonts(std::string const& dir, bool recurse)
for (boost::filesystem::directory_iterator itr(dir); itr != end_itr; ++itr) for (boost::filesystem::directory_iterator itr(dir); itr != end_itr; ++itr)
{ {
#if (BOOST_FILESYSTEM_VERSION == 3) #if (BOOST_FILESYSTEM_VERSION == 3)
std::string const& file_name = itr->path().string(); std::string file_name = itr->path().string();
#else // v2 #else // v2
std::string const& file_name = itr->string(); std::string file_name = itr->string();
#endif #endif
if (boost::filesystem::is_directory(*itr) && recurse) if (boost::filesystem::is_directory(*itr) && recurse)
{ {
@ -157,9 +157,9 @@ bool freetype_engine::register_fonts(std::string const& dir, bool recurse)
else else
{ {
#if (BOOST_FILESYSTEM_VERSION == 3) #if (BOOST_FILESYSTEM_VERSION == 3)
std::string const& base_name = itr->path().filename().string(); std::string base_name = itr->path().filename().string();
#else // v2 #else // v2
std::string const& 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) &&