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

boost filesystem v3 support, ported from trunk

Browse source
This commit is contained in:
Dane Springmeyer 2011-01-06 00:29:03 +00:00
parent 4a962d9d9e
commit c378ddb55e
3 changed files with 44 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/datasource_cache.cpp
View file

@ -44,8 +44,8 @@
namespace mapnik
{
using namespace std;
using namespace boost;
//using namespace std;
//using namespace boost;
bool is_input_plugin (std::string const& filename)
{
@ -77,7 +77,7 @@ std::vector<std::string> datasource_cache::plugin_directories_;
}
datasource_ptr ds;
map<string,boost::shared_ptr<PluginInfo> >::iterator itr=plugins_.find(*type);
std::map<string,boost::shared_ptr<PluginInfo> >::iterator itr=plugins_.find(*type);
if ( itr == plugins_.end() )
{
throw config_error(string("Could not create datasource. No plugin ") +
@ -141,26 +141,35 @@ std::string datasource_cache::plugin_directories()
mutex::scoped_lock lock(mapnik::singleton<mapnik::datasource_cache,
mapnik::CreateStatic>::mutex_);
#endif
filesystem::path path(str);
boost::filesystem::path path(str);
plugin_directories_.push_back(str);
filesystem::directory_iterator end_itr;
boost::filesystem::directory_iterator end_itr;
if (exists(path) && is_directory(path))
{
for (filesystem::directory_iterator itr(path);itr!=end_itr;++itr )
for (boost::filesystem::directory_iterator itr(path);itr!=end_itr;++itr )
{
#if BOOST_VERSION < 103400
if (!is_directory( *itr ) && is_input_plugin(itr->leaf()))
#else
#if (BOOST_FILESYSTEM_VERSION == 3)
if (!is_directory( *itr ) && is_input_plugin(itr->path().filename().string()))
#else // v2
if (!is_directory( *itr ) && is_input_plugin(itr->path().leaf()))
#endif
#endif
{
try
{
lt_dlhandle module=lt_dlopen(itr->string().c_str());
#if (BOOST_FILESYSTEM_VERSION == 3)
lt_dlhandle module = lt_dlopen(itr->path().string().c_str());
#else // v2
lt_dlhandle module = lt_dlopen(itr->string().c_str());
#endif
if (module)
{
datasource_name* ds_name =
@ -175,7 +184,13 @@ std::string datasource_cache::plugin_directories()
}
else
{
std::clog << "Problem loading plugin library: " << itr->string().c_str() << " (libtool error: " << lt_dlerror() << ")" << std::endl;
#if (BOOST_FILESYSTEM_VERSION == 3)
std::clog << "Problem loading plugin library: " << itr->path().string()
<< " (dlopen failed - plugin likely has an unsatified dependency or incompatible ABI)" << std::endl;
#else // v2
std::clog << "Problem loading plugin library: " << itr->string()
<< " (dlopen failed - plugin likely has an unsatified dependency or incompatible ABI)" << std::endl;
#endif
}
}
catch (...) {}

8
src/font_engine_freetype.cpp
View file

@ -99,11 +99,19 @@ bool freetype_engine::register_fonts(std::string const& dir, bool recurse)
{
if (boost::filesystem::is_directory(*itr) && recurse)
{
#if (BOOST_FILESYSTEM_VERSION == 3)
if (!register_fonts(itr->path().string(), true)) return false;
#else // v2
if (!register_fonts(itr->string(), true)) return false;
#endif
}
else
{
#if (BOOST_FILESYSTEM_VERSION == 3)
mapnik::freetype_engine::register_font(itr->path().string());
#else // v2
mapnik::freetype_engine::register_font(itr->string());
#endif
}
}
return true;

15
src/load_map.cpp
View file

@ -534,8 +534,11 @@ void map_parser::parse_layer( Map & map, ptree const & lay )
map.addLayer(lyr);
} catch (const config_error & ex) {
if ( ! name.empty() ) {
}
catch (const config_error & ex)
{
if ( ! name.empty() )
{
ex.append_context(string("(encountered during parsing of layer '") + name + "' in map '" + filename_ + "')");
}
throw;
@ -1712,8 +1715,14 @@ std::string map_parser::ensure_relative_to_xml( boost::optional<std::string> opt
{
boost::filesystem::path xml_path = filename_;
boost::filesystem::path rel_path = *opt_path;
if ( !rel_path.has_root_path() ) {
if ( !rel_path.has_root_path() )
{
#if (BOOST_FILESYSTEM_VERSION == 3)
boost::filesystem::path full = boost::filesystem::absolute(xml_path.branch_path()/rel_path).normalize();
#else // v2
boost::filesystem::path full = boost::filesystem::complete(xml_path.branch_path()/rel_path).normalize();
#endif
#ifdef MAPNIK_DEBUG
std::clog << "\nModifying relative paths to be relative to xml...\n";
std::clog << "original base path: " << *opt_path << "\n";