Merge pull request #3302 from Kaju-Bubanja/fix/removed_unused_params

Deleted unused params and added deprecation warning
PointCloudLibrary · Aug 22, 2019 · b2212ef · b2212ef
2 parents e39fb82 + c255bb4
commit b2212ef
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/segmentation/include/pcl/segmentation/impl/organized_multi_plane_segmentation.hpp b/segmentation/include/pcl/segmentation/impl/organized_multi_plane_segmentation.hpp
@@ -312,8 +312,6 @@ pcl::OrganizedMultiPlaneSegmentation<PointT, PointNT, PointLT>::segmentAndRefine
 template<typename PointT, typename PointNT, typename PointLT> void
 pcl::OrganizedMultiPlaneSegmentation<PointT, PointNT, PointLT>::refine (std::vector<ModelCoefficients>& model_coefficients, 
                                                                         std::vector<PointIndices>& inlier_indices,
-                                                                        std::vector<Eigen::Vector4f, Eigen::aligned_allocator<Eigen::Vector4f> >&,
-                                                                        std::vector <Eigen::Matrix3f, Eigen::aligned_allocator<Eigen::Matrix3f> >&,
                                                                         PointCloudLPtr& labels,
                                                                         std::vector<pcl::PointIndices>& label_indices)
 {

diff --git a/segmentation/include/pcl/segmentation/organized_multi_plane_segmentation.h b/segmentation/include/pcl/segmentation/organized_multi_plane_segmentation.h
@@ -263,7 +263,19 @@ namespace pcl
                         PointCloudLPtr& labels,
                         std::vector<pcl::PointIndices>& label_indices,
                         std::vector<pcl::PointIndices>& boundary_indices);
-
+
+      /** \brief Perform a refinement of an initial segmentation, by comparing points to adjacent regions detected by the initial segmentation.
+        * \param [in] model_coefficients The list of segmented model coefficients
+        * \param [in] inlier_indices The list of segmented inlier indices, corresponding to each model
+        * \param [in] labels The labels produced by the initial segmentation
+        * \param [in] label_indices The list of indices corresponding to each label
+        */
+      void
+      refine (std::vector<ModelCoefficients>& model_coefficients,
+              std::vector<PointIndices>& inlier_indices,
+              PointCloudLPtr& labels,
+              std::vector<pcl::PointIndices>& label_indices);
+
       /** \brief Perform a refinement of an initial segmentation, by comparing points to adjacent regions detected by the initial segmentation.
         * \param [in] model_coefficients The list of segmented model coefficients
         * \param [in] inlier_indices The list of segmented inlier indices, corresponding to each model
@@ -272,13 +284,17 @@ namespace pcl
         * \param [in] labels The labels produced by the initial segmentation
         * \param [in] label_indices The list of indices corresponding to each label
         */
+      [[deprecated("centroids and covariances parameters are not used; they are deprecated and will be removed in future releases")]]
       void
       refine (std::vector<ModelCoefficients>& model_coefficients, 
               std::vector<PointIndices>& inlier_indices,
               std::vector<Eigen::Vector4f, Eigen::aligned_allocator<Eigen::Vector4f> >& centroids,
               std::vector <Eigen::Matrix3f, Eigen::aligned_allocator<Eigen::Matrix3f> >& covariances,
               PointCloudLPtr& labels,
-              std::vector<pcl::PointIndices>& label_indices);
+              std::vector<pcl::PointIndices>& label_indices)
+      {
+        refine(model_coefficients, inlier_indices, labels, label_indices);
+      }
 
     protected: