Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix failing build due to deprecated boost::filesystem functions #577

Merged
merged 1 commit into from
Jul 2, 2024
Merged

Fix failing build due to deprecated boost::filesystem functions #577

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 42 additions & 27 deletions pointmatcher/IO.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ void PointMatcherSupport::validateFile(const std::string& fileName)
if (!ifs.good() || !boost::filesystem::is_regular_file(fullPath))
#if BOOST_FILESYSTEM_VERSION >= 3
#if BOOST_VERSION >= 105000
throw runtime_error(string("Cannot open file ") + boost::filesystem::complete(fullPath).generic_string());
throw runtime_error(string("Cannot open file ") + boost::filesystem::absolute(fullPath).generic_string());
#else
throw runtime_error(string("Cannot open file ") + boost::filesystem3::complete(fullPath).generic_string());
#endif
Expand All @@ -375,17 +375,24 @@ template<typename T>
typename PointMatcher<T>::DataPoints PointMatcher<T>::DataPoints::load(const std::string& fileName)
{
const boost::filesystem::path path(fileName);
const string& ext(boost::filesystem::extension(path));
if (boost::iequals(ext, ".vtk"))
return PointMatcherIO<T>::loadVTK(fileName);
else if (boost::iequals(ext, ".csv"))
return PointMatcherIO<T>::loadCSV(fileName);
else if (boost::iequals(ext, ".ply"))
return PointMatcherIO<T>::loadPLY(fileName);
else if (boost::iequals(ext, ".pcd"))
return PointMatcherIO<T>::loadPCD(fileName);
else
throw runtime_error("loadAnyFormat(): Unknown extension \"" + ext + "\" for file \"" + fileName + "\", extension must be either \".vtk\" or \".csv\"");
if (path.has_extension())
{
const string& ext(path.extension().string());
if(boost::iequals(ext, ".vtk"))
return PointMatcherIO<T>::loadVTK(fileName);
else if(boost::iequals(ext, ".csv"))
return PointMatcherIO<T>::loadCSV(fileName);
else if(boost::iequals(ext, ".ply"))
return PointMatcherIO<T>::loadPLY(fileName);
else if(boost::iequals(ext, ".pcd"))
return PointMatcherIO<T>::loadPCD(fileName);
else
throw runtime_error("loadAnyFormat(): Unknown extension \"" + ext + "\" for file \"" + fileName + "\", extension must be either \".vtk\", \".ply\", \".pcd\" or \".csv\"");
}
else
{
throw runtime_error("loadAnyFormat(): Missing extension for file \"" + fileName + "\", extension must be either \".vtk\" or \".csv\"");
}
}

template
Expand Down Expand Up @@ -809,21 +816,29 @@ template<typename T>
void PointMatcher<T>::DataPoints::save(const std::string& fileName, bool binary, unsigned precision) const
{
const boost::filesystem::path path(fileName);
const string& ext(boost::filesystem::extension(path));
if (boost::iequals(ext, ".vtk"))
return PointMatcherIO<T>::saveVTK(*this, fileName, binary, precision);

if (binary)
throw runtime_error("save(): Binary writing is not supported together with extension \"" + ext + "\". Currently binary writing is only supported with \".vtk\".");

if (boost::iequals(ext, ".csv"))
return PointMatcherIO<T>::saveCSV(*this, fileName, precision);
else if (boost::iequals(ext, ".ply"))
return PointMatcherIO<T>::savePLY(*this, fileName, precision);
else if (boost::iequals(ext, ".pcd"))
return PointMatcherIO<T>::savePCD(*this, fileName, precision);
else
throw runtime_error("save(): Unknown extension \"" + ext + "\" for file \"" + fileName + "\", extension must be either \".vtk\", \".ply\", \".pcd\" or \".csv\"");
if (path.has_extension())
{
const string& ext(path.extension().string());
if (boost::iequals(ext, ".vtk"))
return PointMatcherIO<T>::saveVTK(*this, fileName, binary, precision);

if (binary)
throw runtime_error("save(): Binary writing is not supported together with extension \"" + ext + "\". Currently binary writing is only supported with \".vtk\".");

if (boost::iequals(ext, ".csv"))
return PointMatcherIO<T>::saveCSV(*this, fileName, precision);
else if (boost::iequals(ext, ".ply"))
return PointMatcherIO<T>::savePLY(*this, fileName, precision);
else if (boost::iequals(ext, ".pcd"))
return PointMatcherIO<T>::savePCD(*this, fileName, precision);
else
throw runtime_error("save(): Unknown extension \"" + ext + "\" for file \"" + fileName + "\", extension must be either \".vtk\", \".ply\", \".pcd\" or \".csv\"");

}
else
{
throw runtime_error("save(): Missing extension for file \"" + fileName + "\", extension must be either \".vtk\", \".ply\", \".pcd\" or \".csv\"");
}
}

template
Expand Down
Loading