Merge pull request #3078 from SergioRAgostinho/cv-visualization-rebase

[visualization] Migrate mutex, locks and cvs to C++14
PointCloudLibrary · May 15, 2019 · 62dcba7 · 62dcba7
2 parents f020a1b + 16aba76
commit 62dcba7
Show file tree

Hide file tree

Showing 40 changed files with 131 additions and 61 deletions.
diff --git a/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/tools/openni_frame_source.h b/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/tools/openni_frame_source.h
@@ -3,6 +3,8 @@
 #include <pcl/io/openni_grabber.h>
 #include <pcl/visualization/pcl_visualizer.h>
 
+#include <boost/thread/mutex.hpp>
+
 namespace OpenNIFrameSource
 {
 

diff --git a/apps/include/pcl/apps/face_detection/openni_frame_source.h b/apps/include/pcl/apps/face_detection/openni_frame_source.h
@@ -3,6 +3,8 @@
 #include <pcl/io/openni_grabber.h>
 #include <pcl/visualization/pcl_visualizer.h>
 
+#include <boost/thread/mutex.hpp>
+
 namespace OpenNIFrameSource
 {
 

diff --git a/apps/include/pcl/apps/impl/dominant_plane_segmentation.hpp b/apps/include/pcl/apps/impl/dominant_plane_segmentation.hpp
@@ -33,7 +33,6 @@
  *
  */
 
-#include <pcl/apps/dominant_plane_segmentation.h>
 #include <pcl/visualization/pcl_visualizer.h>
 #include <pcl/features/integral_image_normal.h>
 #include <pcl/common/time.h>

diff --git a/apps/src/dominant_plane_segmentation.cpp b/apps/src/dominant_plane_segmentation.cpp
@@ -33,13 +33,15 @@
  *
  */
 
-#include <pcl/point_types.h>
-#include <pcl/impl/instantiate.hpp>
 #include <pcl/apps/dominant_plane_segmentation.h>
-#include <pcl/apps/impl/dominant_plane_segmentation.hpp>
 
+#ifndef PCL_NO_PRECOMPILE
+#include <pcl/apps/impl/dominant_plane_segmentation.hpp>
+#include <pcl/point_types.h>
+#include <pcl/impl/instantiate.hpp>
 #ifdef PCL_ONLY_CORE_POINT_TYPES
   PCL_INSTANTIATE(DominantPlaneSegmentation, (pcl::PointXYZ)(pcl::PointXYZI)(pcl::PointXYZRGBA)(pcl::PointXYZRGB))
 #else
   PCL_INSTANTIATE(DominantPlaneSegmentation, PCL_XYZ_POINT_TYPES)
-#endif
+#endif // PCL_ONLY_CORE_POINT_TYPES
+#endif // PCL_NO_PRECOMPILE
diff --git a/apps/src/ni_agast.cpp b/apps/src/ni_agast.cpp
@@ -39,8 +39,6 @@
 
 #define SHOW_FPS 1
 
-#include <thread>
-
 #include <pcl/apps/timer.h>
 #include <pcl/common/common.h>
 #include <pcl/common/angles.h>
@@ -54,6 +52,10 @@
 #include <pcl/console/print.h>
 #include <pcl/console/parse.h>
 
+#include <boost/thread/mutex.hpp>
+
+#include <thread>
+
 using namespace pcl;
 using namespace std;
 using namespace std::chrono_literals;

diff --git a/apps/src/ni_brisk.cpp b/apps/src/ni_brisk.cpp
@@ -39,8 +39,6 @@
 
 #define SHOW_FPS 1
 
-#include <thread>
-
 #include <pcl/apps/timer.h>
 #include <pcl/common/common.h>
 #include <pcl/common/angles.h>
@@ -54,6 +52,10 @@
 #include <pcl/console/print.h>
 #include <pcl/console/parse.h>
 
+#include <boost/thread/mutex.hpp>
+
+#include <thread>
+
 using namespace pcl;
 using namespace std;
 using namespace std::chrono_literals;

diff --git a/apps/src/ni_linemod.cpp b/apps/src/ni_linemod.cpp
@@ -37,8 +37,6 @@
  *
  */
 
-#include <thread>
-
 #include <pcl/apps/timer.h>
 #include <pcl/common/common.h>
 #include <pcl/common/angles.h>
@@ -52,7 +50,6 @@
 #include <pcl/segmentation/sac_segmentation.h>
 #include <pcl/segmentation/extract_polygonal_prism_data.h>
 #include <pcl/sample_consensus/sac_model_plane.h>
-//#include <pcl/io/tar_io.h>
 #include <pcl/surface/convex_hull.h>
 #include <pcl/visualization/point_cloud_handlers.h>
 #include <pcl/visualization/pcl_visualizer.h>
@@ -64,6 +61,10 @@
 #include <pcl/segmentation/edge_aware_plane_comparator.h>
 #include <pcl/geometry/polygon_operations.h>
 
+#include <boost/thread/mutex.hpp>
+
+#include <thread>
+
 using namespace pcl;
 using namespace std;
 using namespace std::chrono_literals;

diff --git a/apps/src/ni_susan.cpp b/apps/src/ni_susan.cpp
@@ -39,8 +39,6 @@
 
 #define SHOW_FPS 1
 
-#include <thread>
-
 #include <pcl/apps/timer.h>
 #include <pcl/common/common.h>
 #include <pcl/common/angles.h>
@@ -53,6 +51,10 @@
 #include <pcl/console/print.h>
 #include <pcl/console/parse.h>
 
+#include <boost/thread/mutex.hpp>
+
+#include <thread>
+
 using namespace pcl;
 using namespace std;
 using namespace std::chrono_literals;

diff --git a/apps/src/ni_trajkovic.cpp b/apps/src/ni_trajkovic.cpp
@@ -39,8 +39,6 @@
 
 #define SHOW_FPS 1
 
-#include <thread>
-
 #include <pcl/apps/timer.h>
 #include <pcl/common/common.h>
 #include <pcl/io/openni_grabber.h>
@@ -51,6 +49,10 @@
 #include <pcl/console/print.h>
 #include <pcl/console/parse.h>
 
+#include <boost/thread/mutex.hpp>
+
+#include <thread>
+
 using namespace std::chrono_literals;
 using namespace pcl;
 typedef PointXYZRGBA PointT;

diff --git a/apps/src/openni_3d_concave_hull.cpp b/apps/src/openni_3d_concave_hull.cpp
@@ -33,8 +33,6 @@
  *	
  */
 
-#include <thread>
-
 #include <pcl/point_cloud.h>
 #include <pcl/point_types.h>
 #include <pcl/io/openni_grabber.h>
@@ -46,6 +44,10 @@
 #include <pcl/common/time.h>
 #include <pcl/visualization/cloud_viewer.h>
 
+#include <boost/thread/mutex.hpp>
+
+#include <thread>
+
 using namespace pcl;
 using namespace pcl::visualization;
 using namespace std;

diff --git a/apps/src/openni_3d_convex_hull.cpp b/apps/src/openni_3d_convex_hull.cpp
@@ -33,8 +33,6 @@
  *	
  */
 
-#include <thread>
-
 #include <pcl/point_cloud.h>
 #include <pcl/point_types.h>
 #include <pcl/io/openni_grabber.h>
@@ -46,6 +44,10 @@
 #include <pcl/common/time.h>
 #include <pcl/visualization/cloud_viewer.h>
 
+#include <boost/thread/mutex.hpp>
+
+#include <thread>
+
 using namespace std;
 using namespace std::chrono_literals;
 using namespace pcl;

diff --git a/apps/src/openni_boundary_estimation.cpp b/apps/src/openni_boundary_estimation.cpp
@@ -35,8 +35,6 @@
  *
  */
 
-#include <thread>
-
 #include <pcl/point_cloud.h>
 #include <pcl/point_types.h>
 #include <pcl/io/openni_grabber.h>
@@ -49,6 +47,10 @@
 #include <pcl/common/time.h>
 #include <pcl/visualization/cloud_viewer.h>
 
+#include <boost/thread/mutex.hpp>
+
+#include <thread>
+
 using namespace std::chrono_literals;
 
 typedef pcl::visualization::PointCloudColorHandler<pcl::PCLPointCloud2> ColorHandler;

diff --git a/apps/src/openni_fast_mesh.cpp b/apps/src/openni_fast_mesh.cpp
@@ -33,8 +33,6 @@
  *	
  */
 
-#include <thread>
-
 #include <pcl/point_cloud.h>
 #include <pcl/point_types.h>
 #include <pcl/io/openni_grabber.h>
@@ -45,6 +43,10 @@
 #include <pcl/common/time.h>
 #include <pcl/visualization/cloud_viewer.h>
 
+#include <boost/thread/mutex.hpp>
+
+#include <thread>
+
 using namespace pcl;
 using namespace pcl::visualization;
 using namespace std;

diff --git a/apps/src/openni_feature_persistence.cpp b/apps/src/openni_feature_persistence.cpp
@@ -35,8 +35,6 @@
  *
  */
 
-#include <thread>
-
 #include <pcl/point_cloud.h>
 #include <pcl/point_types.h>
 #include <pcl/io/openni_grabber.h>
@@ -45,13 +43,16 @@
 #include <pcl/console/parse.h>
 #include <pcl/common/time.h>
 #include <pcl/visualization/cloud_viewer.h>
-
 #include <pcl/features/multiscale_feature_persistence.h>
 #include <pcl/features/fpfh_omp.h>
 #include <pcl/filters/voxel_grid.h>
 #include <pcl/filters/extract_indices.h>
 #include <pcl/features/normal_3d_omp.h>
 
+#include <boost/thread/mutex.hpp>
+
+#include <thread>
+
 using namespace std::chrono_literals;
 
 #define FPS_CALC(_WHAT_) \

diff --git a/apps/src/openni_ii_normal_estimation.cpp b/apps/src/openni_ii_normal_estimation.cpp
@@ -33,8 +33,6 @@
  *
  */
 
-#include <thread>
-
 #include <pcl/point_cloud.h>
 #include <pcl/point_types.h>
 #include <pcl/io/openni_grabber.h>
@@ -45,6 +43,10 @@
 #include <pcl/common/time.h>
 #include <pcl/visualization/cloud_viewer.h>
 
+#include <boost/thread/mutex.hpp>
+
+#include <thread>
+
 using namespace std::chrono_literals;
 
 #define FPS_CALC(_WHAT_) \

diff --git a/apps/src/openni_klt.cpp b/apps/src/openni_klt.cpp
@@ -44,6 +44,8 @@
 #include <pcl/io/pcd_io.h>
 #include <pcl/keypoints/harris_2d.h>
 
+#include <boost/thread/mutex.hpp>
+
 #define SHOW_FPS 1
 #if SHOW_FPS
 #define FPS_CALC(_WHAT_) \

diff --git a/apps/src/openni_mls_smoothing.cpp b/apps/src/openni_mls_smoothing.cpp
@@ -42,6 +42,8 @@
 #include <pcl/common/time.h>
 #include <pcl/surface/mls.h>
 
+#include <boost/thread/mutex.hpp>
+
 #define FPS_CALC(_WHAT_) \
 do \
 { \

diff --git a/apps/src/openni_mobile_server.cpp b/apps/src/openni_mobile_server.cpp
@@ -45,6 +45,7 @@
 #include <pcl/common/time.h>
 
 #include <boost/asio.hpp>
+#include <boost/thread/mutex.hpp>
 
 using boost::asio::ip::tcp;
 using namespace std::chrono_literals;

diff --git a/apps/src/openni_organized_edge_detection.cpp b/apps/src/openni_organized_edge_detection.cpp
@@ -41,6 +41,8 @@
 #include <pcl/io/openni_grabber.h>
 #include <pcl/visualization/pcl_visualizer.h>
 
+#include <boost/thread/mutex.hpp>
+
 typedef pcl::PointXYZRGBA PointT;
 
 class OpenNIOrganizedEdgeDetection

diff --git a/apps/src/openni_organized_multi_plane_segmentation.cpp b/apps/src/openni_organized_multi_plane_segmentation.cpp
@@ -46,6 +46,9 @@
 #include <pcl/segmentation/organized_connected_component_segmentation.h>
 #include <pcl/filters/extract_indices.h>
 
+#include <boost/thread/mutex.hpp>
+
+
 typedef pcl::PointXYZRGBA PointT;
 
 class OpenNIOrganizedMultiPlaneSegmentation

diff --git a/apps/src/openni_planar_convex_hull.cpp b/apps/src/openni_planar_convex_hull.cpp
@@ -46,6 +46,8 @@
 #include <pcl/filters/project_inliers.h>
 #include <pcl/surface/convex_hull.h>
 
+#include <boost/thread/mutex.hpp>
+
 template <typename PointType>
 class OpenNIPlanarSegmentation
 {

diff --git a/apps/src/openni_planar_segmentation.cpp b/apps/src/openni_planar_segmentation.cpp
@@ -45,6 +45,8 @@
 #include <pcl/filters/voxel_grid.h>
 #include <pcl/filters/extract_indices.h>
 
+#include <boost/thread/mutex.hpp>
+
 
 template <typename PointType>
 class OpenNIPlanarSegmentation

diff --git a/apps/src/openni_tracking.cpp b/apps/src/openni_tracking.cpp
@@ -35,8 +35,6 @@
  *
  */
 
-#include <thread>
-
 #include <pcl/tracking/tracking.h>
 #include <pcl/tracking/particle_filter.h>
 #include <pcl/tracking/kld_adaptive_particle_filter_omp.h>
@@ -85,6 +83,9 @@
 #include <pcl/common/transforms.h>
 
 #include <boost/format.hpp>
+#include <boost/thread/mutex.hpp>
+
+#include <thread>
 
 #define FPS_CALC_BEGIN                          \
     static double duration = 0;                 \

diff --git a/apps/src/openni_uniform_sampling.cpp b/apps/src/openni_uniform_sampling.cpp
@@ -33,8 +33,6 @@
  *	
  */
 
-#include <thread>
-
 #include <pcl/point_cloud.h>
 #include <pcl/point_types.h>
 #include <pcl/io/openni_grabber.h>
@@ -44,6 +42,10 @@
 #include <pcl/console/parse.h>
 #include <pcl/common/time.h>
 
+#include <boost/thread/mutex.hpp>
+
+#include <thread>
+
 using namespace std::chrono_literals;
 
 #define FPS_CALC(_WHAT_) \

diff --git a/apps/src/openni_voxel_grid.cpp b/apps/src/openni_voxel_grid.cpp
@@ -43,6 +43,9 @@
 #include <pcl/console/parse.h>
 #include <pcl/common/time.h>
 
+#include <boost/thread/mutex.hpp>
+
+
 #define FPS_CALC(_WHAT_) \
 do \
 { \