Move filesystem headers to pcl_filesystem.h (#5945)

* Move filesystem headers to pcl_filesystem.h

* Add missing pcl_filesystem.h

* Corresponding line changes for vfh_recognition.rst

Author: cybaol

apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/utils/persistence_utils.h

@@ -1,15 +1,8 @@
+#include <pcl/common/pcl_filesystem.h>
 #include <pcl/io/pcd_io.h>
 
 #include <boost/algorithm/string.hpp>
 
-#if (__cplusplus >= 201703L)
-#include <filesystem>
-namespace pcl_fs = std::filesystem;
-#else
-#include <boost/filesystem.hpp>
-namespace pcl_fs = boost::filesystem;
-#endif
-
 #include <fstream>
 
 namespace pcl {

apps/in_hand_scanner/src/offline_integration.cpp

@@ -40,20 +40,13 @@
 
 #include <pcl/apps/in_hand_scanner/integration.h>
 #include <pcl/apps/in_hand_scanner/offline_integration.h>
+#include <pcl/common/pcl_filesystem.h>
 #include <pcl/common/transforms.h>
 #include <pcl/features/integral_image_normal.h>
 #include <pcl/io/pcd_io.h>
 
 #include <boost/algorithm/string/case_conv.hpp>
 
-#if (__cplusplus >= 201703L)
-#include <filesystem>
-namespace pcl_fs = std::filesystem;
-#else
-#include <boost/filesystem.hpp>
-namespace pcl_fs = boost::filesystem;
-#endif
-
 #include <QApplication>
 #include <QFileDialog>
 #include <QKeyEvent>

apps/include/pcl/apps/face_detection/face_detection_apps_utils.h

@@ -7,13 +7,7 @@
 
 #pragma once
 
-#if (__cplusplus >= 201703L)
-#include <filesystem>
-namespace pcl_fs = std::filesystem;
-#else
-#include <boost/filesystem.hpp>
-namespace pcl_fs = boost::filesystem;
-#endif
+#include <pcl/common/pcl_filesystem.h>
 
 namespace face_detection_apps_utils {
 

apps/include/pcl/apps/pcd_video_player.h

@@ -35,21 +35,14 @@
  */
 
 #include <pcl/common/common.h>
+#include <pcl/common/pcl_filesystem.h>
 #include <pcl/common/time.h>
 #include <pcl/registration/transformation_estimation_svd.h>
 #include <pcl/visualization/pcl_visualizer.h>
 #include <pcl/visualization/point_cloud_handlers.h>
 #include <pcl/point_cloud.h>
 #include <pcl/point_types.h>
 
-#if (__cplusplus >= 201703L)
-#include <filesystem>
-namespace pcl_fs = std::filesystem;
-#else
-#include <boost/filesystem.hpp>
-namespace pcl_fs = boost::filesystem;
-#endif
-
 #include <QMainWindow>
 #include <QMutex>
 #include <QTimer>

apps/src/face_detection/filesystem_face_detection.cpp

@@ -5,6 +5,7 @@
  *      Author: Aitor Aldoma
  */
 
+#include <pcl/common/pcl_filesystem.h>
 #include <pcl/console/parse.h>
 #include <pcl/io/pcd_io.h>
 #include <pcl/recognition/face_detection/rf_face_detector_trainer.h>
@@ -13,14 +14,6 @@
 #include <pcl/apps/face_detection/face_detection_apps_utils.h>
 // clang-format on
 
-#if (__cplusplus >= 201703L)
-#include <filesystem>
-namespace pcl_fs = std::filesystem;
-#else
-#include <boost/filesystem.hpp>
-namespace pcl_fs = boost::filesystem;
-#endif
-
 bool SHOW_GT = false;
 bool VIDEO = false;
 

apps/src/openni_grab_frame.cpp

@@ -35,6 +35,7 @@
  *         Christian Potthast (potthast@usc.edu)
  */
 
+#include <pcl/common/pcl_filesystem.h>
 #include <pcl/common/time.h>
 #include <pcl/console/parse.h>
 #include <pcl/console/print.h>
@@ -45,14 +46,6 @@
 #include <pcl/point_cloud.h>
 #include <pcl/point_types.h>
 
-#if (__cplusplus >= 201703L)
-#include <filesystem>
-namespace pcl_fs = std::filesystem;
-#else
-#include <boost/filesystem.hpp>
-namespace pcl_fs = boost::filesystem;
-#endif
-
 #include <mutex>
 
 using namespace std::chrono_literals;

apps/src/stereo_ground_segmentation.cpp

@@ -36,6 +36,7 @@
 #include <pcl/common/centroid.h> // for computeMeanAndCovarianceMatrix
 #include <pcl/common/distances.h>
 #include <pcl/common/intersections.h>
+#include <pcl/common/pcl_filesystem.h>
 #include <pcl/features/integral_image_normal.h>
 #include <pcl/io/pcd_io.h>
 #include <pcl/sample_consensus/sac_model_plane.h>
@@ -50,14 +51,6 @@
 #include <pcl/visualization/pcl_visualizer.h>
 #include <pcl/ModelCoefficients.h>
 
-#if (__cplusplus >= 201703L)
-#include <filesystem> // for directory_iterator
-namespace pcl_fs = std::filesystem;
-#else
-#include <boost/filesystem.hpp> // for directory_iterator
-namespace pcl_fs = boost::filesystem;
-#endif
-
 #include <mutex>
 
 using PointT = pcl::PointXYZRGB;

common/CMakeLists.txt

@@ -98,6 +98,7 @@ set(common_incs
   include/pcl/common/file_io.h
   include/pcl/common/intersections.h
   include/pcl/common/norms.h
+  include/pcl/common/pcl_filesystem.h
   include/pcl/common/piecewise_linear_function.h
   include/pcl/common/polynomial_calculations.h
   include/pcl/common/poses_from_matches.h

common/include/pcl/common/impl/file_io.hpp

@@ -39,13 +39,7 @@
 #ifndef PCL_COMMON_FILE_IO_IMPL_HPP_
 #define PCL_COMMON_FILE_IO_IMPL_HPP_
 
-#if (__cplusplus >= 201703L)
-#include <filesystem>
-namespace pcl_fs = std::filesystem;
-#else
-#include <boost/filesystem.hpp>
-namespace pcl_fs = boost::filesystem;
-#endif
+#include <pcl/common/pcl_filesystem.h>
 
 #include <boost/range/iterator_range.hpp>
 

common/include/pcl/common/pcl_filesystem.h

@@ -0,0 +1,47 @@
+/*
+ * Software License Agreement (BSD License)
+ *
+ *  Point Cloud Library (PCL) - www.pointclouds.org
+ *  Copyright (C) 2024 Kino <cybao292261@163.com>
+ *
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above
+ *     copyright notice, this list of conditions and the following
+ *     disclaimer in the documentation and/or other materials provided
+ *     with the distribution.
+ *   * Neither the name of the copyright holder(s) nor the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *  COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *  POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $Id$
+ */
+
+#pragma once
+
+#if (__cplusplus >= 201703L)
+#include <filesystem>
+namespace pcl_fs = std::filesystem;
+#else
+#include <boost/filesystem.hpp>
+namespace pcl_fs = boost::filesystem;
+#endif