replace deprecated boost filesystem basename (#5901)

cybaol · web-flow · commit 95f8d3ec6896 · 2023-12-17T20:27:33.000+01:00
* replace deprecated boost filesystem basename

* try to address CI clang-tidy issues

* address CI clang-tidy issues

* fix Windows build errors
diff --git a/gpu/kinfu_large_scale/tools/standalone_texture_mapping.cpp b/gpu/kinfu_large_scale/tools/standalone_texture_mapping.cpp
@@ -440,7 +440,7 @@ main (int argc, char** argv)
     {
       pcl::TextureMapping<pcl::PointXYZ>::Camera cam;
       readCamPoseFile(it->path ().string (), cam);
-      cam.texture_file = boost::filesystem::basename (it->path ()) + ".png";
+      cam.texture_file = it->path ().stem ().string () + ".png";
       my_cams.push_back (cam);
     }
   }
diff --git a/io/src/image_grabber.cpp b/io/src/image_grabber.cpp
@@ -269,7 +269,7 @@ pcl::ImageGrabberBase::ImageGrabberImpl::loadDepthAndRGBFiles (const std::string
   {
     extension = boost::algorithm::to_upper_copy (boost::filesystem::extension (itr->path ()));
     pathname = itr->path ().string ();
-    basename = boost::filesystem::basename (itr->path ());
+    basename = itr->path ().stem ().string ();
     if (!boost::filesystem::is_directory (itr->status ())
         && isValidExtension (extension))
     {
@@ -312,7 +312,7 @@ pcl::ImageGrabberBase::ImageGrabberImpl::loadDepthAndRGBFiles (const std::string
   {
     extension = boost::algorithm::to_upper_copy (boost::filesystem::extension (itr->path ()));
     pathname = itr->path ().string ();
-    basename = boost::filesystem::basename (itr->path ());
+    basename = itr->path ().stem ().string ();
     if (!boost::filesystem::is_directory (itr->status ())
         && isValidExtension (extension))
     {
@@ -327,7 +327,7 @@ pcl::ImageGrabberBase::ImageGrabberImpl::loadDepthAndRGBFiles (const std::string
   {
     extension = boost::algorithm::to_upper_copy (boost::filesystem::extension (itr->path ()));
     pathname = itr->path ().string ();
-    basename = boost::filesystem::basename (itr->path ());
+    basename = itr->path ().stem ().string ();
     if (!boost::filesystem::is_directory (itr->status ())
         && isValidExtension (extension))
     {
@@ -368,7 +368,7 @@ pcl::ImageGrabberBase::ImageGrabberImpl::loadPCLZFFiles (const std::string &dir)
   {
     extension = boost::algorithm::to_upper_copy (boost::filesystem::extension (itr->path ()));
     pathname = itr->path ().string ();
-    basename = boost::filesystem::basename (itr->path ());
+    basename = itr->path ().stem ().string ();
     if (!boost::filesystem::is_directory (itr->status ())
         && isValidExtension (extension))
     {
@@ -429,7 +429,7 @@ pcl::ImageGrabberBase::ImageGrabberImpl::getTimestampFromFilepath (
 {
   // For now, we assume the file is of the form frame_[22-char POSIX timestamp]_*
   char timestamp_str[256];
-  int result = std::sscanf (boost::filesystem::basename (filepath).c_str (),
+  int result = std::sscanf (boost::filesystem::path (filepath).stem ().string ().c_str (),
                             "frame_%22s_%*s",
                             timestamp_str);
   if (result > 0)
@@ -971,7 +971,7 @@ pcl::ImageGrabberBase::getCurrentDepthFileName () const
     pathname = impl_->depth_pclzf_files_[impl_->cur_frame_];
   else
     pathname = impl_->depth_image_files_[impl_->cur_frame_];
-  std::string basename = boost::filesystem::basename (pathname);
+  std::string basename = boost::filesystem::path (pathname).stem ().string ();
   return (basename);
 }
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -983,7 +983,7 @@ pcl::ImageGrabberBase::getPrevDepthFileName () const
     pathname = impl_->depth_pclzf_files_[impl_->cur_frame_-1];
   else
     pathname = impl_->depth_image_files_[impl_->cur_frame_-1];
-  std::string basename = boost::filesystem::basename (pathname);
+  std::string basename = boost::filesystem::path (pathname).stem ().string ();
   return (basename);
 }
 
@@ -996,7 +996,7 @@ pcl::ImageGrabberBase::getDepthFileNameAtIndex (std::size_t idx) const
     pathname = impl_->depth_pclzf_files_[idx];
   else
     pathname = impl_->depth_image_files_[idx];
-  std::string basename = boost::filesystem::basename (pathname);
+  std::string basename = boost::filesystem::path (pathname).stem ().string ();
   return (basename);
 }
 
diff --git a/outofcore/include/pcl/outofcore/impl/octree_base.hpp b/outofcore/include/pcl/outofcore/impl/octree_base.hpp
@@ -93,7 +93,7 @@ namespace pcl
       root_node_->m_tree_ = this;
 
       // Set the path to the outofcore octree metadata (unique to the root folder) ending in .octree
-      boost::filesystem::path treepath = root_name.parent_path () / (boost::filesystem::basename (root_name) + TREE_EXTENSION_);
+      boost::filesystem::path treepath = root_name.parent_path () / (root_name.stem ().string () + TREE_EXTENSION_);
 
       //Load the JSON metadata
       metadata_->loadMetadataFromDisk (treepath);
@@ -169,7 +169,7 @@ namespace pcl
       root_node_->m_tree_ = this;
       
       // Set root nodes file path
-      boost::filesystem::path treepath = dir / (boost::filesystem::basename (root_name) + TREE_EXTENSION_);
+      boost::filesystem::path treepath = dir / (root_name.stem ().string () + TREE_EXTENSION_);
 
       //fill the fields of the metadata
       metadata_->setCoordinateSystem (coord_sys);
diff --git a/outofcore/include/pcl/outofcore/impl/octree_base_node.hpp b/outofcore/include/pcl/outofcore/impl/octree_base_node.hpp
@@ -1937,7 +1937,7 @@ namespace pcl
     template<typename ContainerT, typename PointT> void
     OutofcoreOctreeBaseNode<ContainerT, PointT>::convertToXYZRecursive ()
     {
-      std::string fname = boost::filesystem::basename (node_metadata_->getPCDFilename ()) + std::string (".dat.xyz");
+      std::string fname = node_metadata_->getPCDFilename ().stem ().string () + ".dat.xyz";
       boost::filesystem::path xyzfile = node_metadata_->getDirectoryPathname () / fname;
       payload_->convertToXYZ (xyzfile);
 

Original file line number	Diff line number	Diff line change
`@@ -440,7 +440,7 @@ main (int argc, char** argv)`
`440`	`440`	`{`
`441`	`441`	`pcl::TextureMapping<pcl::PointXYZ>::Camera cam;`
`442`	`442`	`readCamPoseFile(it->path ().string (), cam);`
`443`		`- cam.texture_file = boost::filesystem::basename (it->path ()) + ".png";`
	`443`	`+ cam.texture_file = it->path ().stem ().string () + ".png";`
`444`	`444`	`my_cams.push_back (cam);`
`445`	`445`	`}`
`446`	`446`	`}`
Original file line number	Diff line number	Diff line change
`@@ -269,7 +269,7 @@ pcl::ImageGrabberBase::ImageGrabberImpl::loadDepthAndRGBFiles (const std::string`
`269`	`269`	`{`
`270`	`270`	`extension = boost::algorithm::to_upper_copy (boost::filesystem::extension (itr->path ()));`
`271`	`271`	`pathname = itr->path ().string ();`
`272`		`- basename = boost::filesystem::basename (itr->path ());`
	`272`	`+ basename = itr->path ().stem ().string ();`
`273`	`273`	`if (!boost::filesystem::is_directory (itr->status ())`
`274`	`274`	`&& isValidExtension (extension))`
`275`	`275`	`{`
`@@ -312,7 +312,7 @@ pcl::ImageGrabberBase::ImageGrabberImpl::loadDepthAndRGBFiles (const std::string`
`312`	`312`	`{`
`313`	`313`	`extension = boost::algorithm::to_upper_copy (boost::filesystem::extension (itr->path ()));`
`314`	`314`	`pathname = itr->path ().string ();`
`315`		`- basename = boost::filesystem::basename (itr->path ());`
	`315`	`+ basename = itr->path ().stem ().string ();`
`316`	`316`	`if (!boost::filesystem::is_directory (itr->status ())`
`317`	`317`	`&& isValidExtension (extension))`
`318`	`318`	`{`
`@@ -327,7 +327,7 @@ pcl::ImageGrabberBase::ImageGrabberImpl::loadDepthAndRGBFiles (const std::string`
`327`	`327`	`{`
`328`	`328`	`extension = boost::algorithm::to_upper_copy (boost::filesystem::extension (itr->path ()));`
`329`	`329`	`pathname = itr->path ().string ();`
`330`		`- basename = boost::filesystem::basename (itr->path ());`
	`330`	`+ basename = itr->path ().stem ().string ();`
`331`	`331`	`if (!boost::filesystem::is_directory (itr->status ())`
`332`	`332`	`&& isValidExtension (extension))`
`333`	`333`	`{`
`@@ -368,7 +368,7 @@ pcl::ImageGrabberBase::ImageGrabberImpl::loadPCLZFFiles (const std::string &dir)`
`368`	`368`	`{`
`369`	`369`	`extension = boost::algorithm::to_upper_copy (boost::filesystem::extension (itr->path ()));`
`370`	`370`	`pathname = itr->path ().string ();`
`371`		`- basename = boost::filesystem::basename (itr->path ());`
	`371`	`+ basename = itr->path ().stem ().string ();`
`372`	`372`	`if (!boost::filesystem::is_directory (itr->status ())`
`373`	`373`	`&& isValidExtension (extension))`
`374`	`374`	`{`
`@@ -429,7 +429,7 @@ pcl::ImageGrabberBase::ImageGrabberImpl::getTimestampFromFilepath (`
`429`	`429`	`{`
`430`	`430`	`// For now, we assume the file is of the form frame_[22-char POSIX timestamp]_*`
`431`	`431`	`char timestamp_str[256];`
`432`		`- int result = std::sscanf (boost::filesystem::basename (filepath).c_str (),`
	`432`	`+ int result = std::sscanf (boost::filesystem::path (filepath).stem ().string ().c_str (),`
`433`	`433`	`"frame_%22s_%*s",`
`434`	`434`	`timestamp_str);`
`435`	`435`	`if (result > 0)`
`@@ -971,7 +971,7 @@ pcl::ImageGrabberBase::getCurrentDepthFileName () const`
`971`	`971`	`pathname = impl_->depth_pclzf_files_[impl_->cur_frame_];`
`972`	`972`	`else`
`973`	`973`	`pathname = impl_->depth_image_files_[impl_->cur_frame_];`
`974`		`- std::string basename = boost::filesystem::basename (pathname);`
	`974`	`+ std::string basename = boost::filesystem::path (pathname).stem ().string ();`
`975`	`975`	`return (basename);`
`976`	`976`	`}`
`977`	`977`	`//////////////////////////////////////////////////////////////////////////////////////////`
`@@ -983,7 +983,7 @@ pcl::ImageGrabberBase::getPrevDepthFileName () const`
`983`	`983`	`pathname = impl_->depth_pclzf_files_[impl_->cur_frame_-1];`
`984`	`984`	`else`
`985`	`985`	`pathname = impl_->depth_image_files_[impl_->cur_frame_-1];`
`986`		`- std::string basename = boost::filesystem::basename (pathname);`
	`986`	`+ std::string basename = boost::filesystem::path (pathname).stem ().string ();`
`987`	`987`	`return (basename);`
`988`	`988`	`}`
`989`	`989`
`@@ -996,7 +996,7 @@ pcl::ImageGrabberBase::getDepthFileNameAtIndex (std::size_t idx) const`
`996`	`996`	`pathname = impl_->depth_pclzf_files_[idx];`
`997`	`997`	`else`
`998`	`998`	`pathname = impl_->depth_image_files_[idx];`
`999`		`- std::string basename = boost::filesystem::basename (pathname);`
	`999`	`+ std::string basename = boost::filesystem::path (pathname).stem ().string ();`
`1000`	`1000`	`return (basename);`
`1001`	`1001`	`}`
`1002`	`1002`
Original file line number	Diff line number	Diff line change
`@@ -1937,7 +1937,7 @@ namespace pcl`
`1937`	`1937`	`template<typename ContainerT, typename PointT> void`
`1938`	`1938`	`OutofcoreOctreeBaseNode<ContainerT, PointT>::convertToXYZRecursive ()`
`1939`	`1939`	`{`
`1940`		`- std::string fname = boost::filesystem::basename (node_metadata_->getPCDFilename ()) + std::string (".dat.xyz");`
	`1940`	`+ std::string fname = node_metadata_->getPCDFilename ().stem ().string () + ".dat.xyz";`
`1941`	`1941`	`boost::filesystem::path xyzfile = node_metadata_->getDirectoryPathname () / fname;`
`1942`	`1942`	`payload_->convertToXYZ (xyzfile);`
`1943`	`1943`