Merge pull request #2867 from 7680x4320/patch-msvc2015u3

Fix SupervoxelClustering compilation problem in MSVC 2015.3
PointCloudLibrary · Feb 17, 2019 · 4606e94 · 4606e94
2 parents c805b36 + d3b3ea0
commit 4606e94
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 16 deletions.
diff --git a/segmentation/include/pcl/segmentation/impl/supervoxel_clustering.hpp b/segmentation/include/pcl/segmentation/impl/supervoxel_clustering.hpp
@@ -57,21 +57,6 @@ pcl::SupervoxelClustering<PointT>::SupervoxelClustering (float voxel_resolution,
   adjacency_octree_.reset (new OctreeAdjacencyT (resolution_));
 }
 
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-template <typename PointT>
-pcl::SupervoxelClustering<PointT>::SupervoxelClustering (float voxel_resolution, float seed_resolution, bool) :
-  resolution_ (voxel_resolution),
-  seed_resolution_ (seed_resolution),
-  adjacency_octree_ (),
-  voxel_centroid_cloud_ (),
-  color_importance_ (0.1f),
-  spatial_importance_ (0.4f),
-  normal_importance_ (1.0f),
-  use_default_transform_behaviour_ (true)
-{
-  adjacency_octree_.reset (new OctreeAdjacencyT (resolution_));
-}
-
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 template <typename PointT>
 pcl::SupervoxelClustering<PointT>::~SupervoxelClustering ()

diff --git a/segmentation/include/pcl/segmentation/supervoxel_clustering.h b/segmentation/include/pcl/segmentation/supervoxel_clustering.h
@@ -190,7 +190,7 @@ namespace pcl
       SupervoxelClustering (float voxel_resolution, float seed_resolution);
 
       [[deprecated("constructor with flag for using the single camera transform is deprecated. Default behavior is now to use the transform for organized clouds, and not use it for unorganized. Use setUseSingleCameraTransform() to override the defaults.")]]
-      SupervoxelClustering (float voxel_resolution, float seed_resolution, bool);
+      SupervoxelClustering (float voxel_resolution, float seed_resolution, bool) : SupervoxelClustering (voxel_resolution, seed_resolution) { }
 
       /** \brief This destructor destroys the cloud, normals and search method used for
         * finding neighbors. In other words it frees memory.