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

[visualization] Migrate mutex, locks and cvs to C++14 #3078

Merged
merged 2 commits into from
May 15, 2019
+131 −61
Merged

[visualization] Migrate mutex, locks and cvs to C++14 #3078

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8147043
[visualization] Migrate mutex, locks and cvs to C++14
SergioRAgostinho May 4, 2019
16aba76
restructure include blocks
SergioRAgostinho May 14, 2019
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
2 changes: 2 additions & 0 deletions apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/tools/openni_frame_source.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
#include <pcl/io/openni_grabber.h>
#include <pcl/visualization/pcl_visualizer.h>

#include <boost/thread/mutex.hpp>

namespace OpenNIFrameSource
{

Expand Down
2 changes: 2 additions & 0 deletions apps/include/pcl/apps/face_detection/openni_frame_source.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
#include <pcl/io/openni_grabber.h>
#include <pcl/visualization/pcl_visualizer.h>

#include <boost/thread/mutex.hpp>

namespace OpenNIFrameSource
{

Expand Down
1 change: 0 additions & 1 deletion apps/include/pcl/apps/impl/dominant_plane_segmentation.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
10 changes: 6 additions & 4 deletions apps/src/dominant_plane_segmentation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 4 additions & 2 deletions apps/src/ni_agast.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -54,6 +52,10 @@
#include <pcl/console/print.h>
#include <pcl/console/parse.h>

#include <boost/thread/mutex.hpp>

#include <thread>
taketwo marked this conversation as resolved.
Show resolved Hide resolved

using namespace pcl;
using namespace std;
using namespace std::chrono_literals;
Expand Down
6 changes: 4 additions & 2 deletions apps/src/ni_brisk.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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;
Expand Down
7 changes: 4 additions & 3 deletions apps/src/ni_linemod.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@
*
*/

#include <thread>

#include <pcl/apps/timer.h>
#include <pcl/common/common.h>
#include <pcl/common/angles.h>
Expand All @@ -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>
Expand All @@ -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;
Expand Down
6 changes: 4 additions & 2 deletions apps/src/ni_susan.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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;
Expand Down
6 changes: 4 additions & 2 deletions apps/src/ni_trajkovic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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;
Expand Down
6 changes: 4 additions & 2 deletions apps/src/openni_3d_concave_hull.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@
*
*/

#include <thread>

#include <pcl/point_cloud.h>
#include <pcl/point_types.h>
#include <pcl/io/openni_grabber.h>
Expand All @@ -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;
Expand Down
6 changes: 4 additions & 2 deletions apps/src/openni_3d_convex_hull.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@
*
*/

#include <thread>

#include <pcl/point_cloud.h>
#include <pcl/point_types.h>
#include <pcl/io/openni_grabber.h>
Expand All @@ -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;
Expand Down
6 changes: 4 additions & 2 deletions apps/src/openni_boundary_estimation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@
*
*/

#include <thread>

#include <pcl/point_cloud.h>
#include <pcl/point_types.h>
#include <pcl/io/openni_grabber.h>
Expand All @@ -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;
Expand Down
6 changes: 4 additions & 2 deletions apps/src/openni_fast_mesh.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@
*
*/

#include <thread>

#include <pcl/point_cloud.h>
#include <pcl/point_types.h>
#include <pcl/io/openni_grabber.h>
Expand All @@ -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;
Expand Down
7 changes: 4 additions & 3 deletions apps/src/openni_feature_persistence.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@
*
*/

#include <thread>

#include <pcl/point_cloud.h>
#include <pcl/point_types.h>
#include <pcl/io/openni_grabber.h>
Expand All @@ -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_) \
Expand Down
6 changes: 4 additions & 2 deletions apps/src/openni_ii_normal_estimation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@
*
*/

#include <thread>

#include <pcl/point_cloud.h>
#include <pcl/point_types.h>
#include <pcl/io/openni_grabber.h>
Expand All @@ -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_) \
Expand Down
2 changes: 2 additions & 0 deletions apps/src/openni_klt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_) \
Expand Down
2 changes: 2 additions & 0 deletions apps/src/openni_mls_smoothing.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@
#include <pcl/common/time.h>
#include <pcl/surface/mls.h>

#include <boost/thread/mutex.hpp>
SergioRAgostinho marked this conversation as resolved.
Show resolved Hide resolved

#define FPS_CALC(_WHAT_) \
do \
{ \
Expand Down
1 change: 1 addition & 0 deletions apps/src/openni_mobile_server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions apps/src/openni_organized_edge_detection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions apps/src/openni_organized_multi_plane_segmentation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions apps/src/openni_planar_convex_hull.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
2 changes: 2 additions & 0 deletions apps/src/openni_planar_segmentation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions apps/src/openni_tracking.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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; \
Expand Down
6 changes: 4 additions & 2 deletions apps/src/openni_uniform_sampling.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@
*
*/

#include <thread>

#include <pcl/point_cloud.h>
#include <pcl/point_types.h>
#include <pcl/io/openni_grabber.h>
Expand All @@ -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_) \
Expand Down
3 changes: 3 additions & 0 deletions apps/src/openni_voxel_grid.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@
#include <pcl/console/parse.h>
#include <pcl/common/time.h>

#include <boost/thread/mutex.hpp>
SergioRAgostinho marked this conversation as resolved.
Show resolved Hide resolved


#define FPS_CALC(_WHAT_) \
do \
{ \
Expand Down
Loading