Remove registration module deprecated methods

registration/CMakeLists.txt

@@ -83,7 +83,6 @@ if(build)
         "include/pcl/${SUBSYS_NAME}/impl/correspondence_estimation_normal_shooting.hpp"
         "include/pcl/${SUBSYS_NAME}/impl/correspondence_estimation_backprojection.hpp"
         "include/pcl/${SUBSYS_NAME}/impl/correspondence_estimation_organized_projection.hpp"
-        "include/pcl/${SUBSYS_NAME}/impl/correspondence_rejection.hpp"
         "include/pcl/${SUBSYS_NAME}/impl/correspondence_rejection_distance.hpp"
         "include/pcl/${SUBSYS_NAME}/impl/correspondence_rejection_median_distance.hpp"
         "include/pcl/${SUBSYS_NAME}/impl/correspondence_rejection_surface_normal.hpp"

registration/include/pcl/registration/correspondence_estimation.h

@@ -108,20 +108,6 @@ namespace pcl
         /** \brief Empty destructor */
         virtual ~CorrespondenceEstimationBase () {}
 
-        /** \brief Provide a pointer to the input source 
-          * (e.g., the point cloud that we want to align to the target)
-          *
-          * \param[in] cloud the input point cloud source
-          */
-        PCL_DEPRECATED ("[pcl::registration::CorrespondenceEstimationBase::setInputCloud] setInputCloud is deprecated. Please use setInputSource instead.")
-        void
-        setInputCloud (const PointCloudSourceConstPtr &cloud);
-
-        /** \brief Get a pointer to the input point cloud dataset target. */
-        PCL_DEPRECATED ("[pcl::registration::CorrespondenceEstimationBase::getInputCloud] getInputCloud is deprecated. Please use getInputSource instead.")
-        PointCloudSourceConstPtr const
-        getInputCloud ();
-
         /** \brief Provide a pointer to the input source 
           * (e.g., the point cloud that we want to align to the target)
           *

registration/include/pcl/registration/correspondence_rejection.h

@@ -246,19 +246,6 @@ namespace pcl
         /** \brief Empty destructor */
         virtual ~DataContainer () {}
 
-        /** \brief Provide a source point cloud dataset (must contain XYZ
-          * data!), used to compute the correspondence distance.  
-          * \param[in] cloud a cloud containing XYZ data
-          */
-        PCL_DEPRECATED ("[pcl::registration::DataContainer::setInputCloud] setInputCloud is deprecated. Please use setInputSource instead.")
-        void
-        setInputCloud (const PointCloudConstPtr &cloud);
-
-        /** \brief Get a pointer to the input point cloud dataset target. */
-        PCL_DEPRECATED ("[pcl::registration::DataContainer::getInputCloud] getInputCloud is deprecated. Please use getInputSource instead.")
-        PointCloudConstPtr const
-        getInputCloud ();
-
         /** \brief Provide a source point cloud dataset (must contain XYZ
           * data!), used to compute the correspondence distance.  
           * \param[in] cloud a cloud containing XYZ data
@@ -418,7 +405,5 @@ namespace pcl
   }
 }
 
-#include <pcl/registration/impl/correspondence_rejection.hpp>
-
 #endif /* PCL_REGISTRATION_CORRESPONDENCE_REJECTION_H_ */
 

registration/include/pcl/registration/correspondence_rejection_sample_consensus.h

@@ -97,18 +97,6 @@ namespace pcl
         getRemainingCorrespondences (const pcl::Correspondences& original_correspondences, 
                                      pcl::Correspondences& remaining_correspondences);
 
-        /** \brief Provide a source point cloud dataset (must contain XYZ data!)
-          * \param[in] cloud a cloud containing XYZ data
-          */
-        PCL_DEPRECATED ("[pcl::registration::CorrespondenceRejectorSampleConsensus::setInputCloud] setInputCloud is deprecated. Please use setInputSource instead.")
-        virtual void
-        setInputCloud (const PointCloudConstPtr &cloud);
-
-        /** \brief Get a pointer to the input point cloud dataset target. */
-        PCL_DEPRECATED ("[pcl::registration::CorrespondenceRejectorSampleConsensus::getInputCloud] getInputCloud is deprecated. Please use getInputSource instead.")
-        PointCloudConstPtr const
-        getInputCloud ();
-
         /** \brief Provide a source point cloud dataset (must contain XYZ data!)
           * \param[in] cloud a cloud containing XYZ data
           */
@@ -122,13 +110,6 @@ namespace pcl
         inline PointCloudConstPtr const 
         getInputSource () { return (input_); }
 
-        /** \brief Provide a target point cloud dataset (must contain XYZ data!)
-          * \param[in] cloud a cloud containing XYZ data
-          */
-        PCL_DEPRECATED ("[pcl::registration::CorrespondenceRejectorSampleConsensus::setTargetCloud] setTargetCloud is deprecated. Please use setInputTarget instead.")
-        virtual void
-        setTargetCloud (const PointCloudConstPtr &cloud);
-
         /** \brief Provide a target point cloud dataset (must contain XYZ data!)
           * \param[in] cloud a cloud containing XYZ data
           */
@@ -181,26 +162,12 @@ namespace pcl
         inline double 
         getInlierThreshold () { return inlier_threshold_; };
 
-        /** \brief Set the maximum number of iterations.
-          * \param[in] max_iterations Maximum number if iterations to run
-          */
-        PCL_DEPRECATED ("[pcl::registration::CorrespondenceRejectorSampleConsensus::setMaxIterations] setMaxIterations is deprecated. Please use setMaximumIterations instead.")
-        void
-        setMaxIterations (int max_iterations);
-
         /** \brief Set the maximum number of iterations.
           * \param[in] max_iterations Maximum number if iterations to run
           */
         inline void 
         setMaximumIterations (int max_iterations) { max_iterations_ = std::max (max_iterations, 0); }
 
-        /** \brief Get the maximum number of iterations.
-          * \return max_iterations Maximum number if iterations to run
-          */
-        PCL_DEPRECATED ("[pcl::registration::CorrespondenceRejectorSampleConsensus::getMaxIterations] getMaxIterations is deprecated. Please use getMaximumIterations instead.")
-        int
-        getMaxIterations ();
-
         /** \brief Get the maximum number of iterations.
           * \return max_iterations Maximum number if iterations to run
           */

registration/include/pcl/registration/gicp.h

@@ -120,13 +120,6 @@ namespace pcl
           boost::bind (&GeneralizedIterativeClosestPoint<PointSource, PointTarget>::estimateRigidTransformationBFGS, 
                        this, _1, _2, _3, _4, _5); 
       }
-
-      /** \brief Provide a pointer to the input dataset
-        * \param cloud the const boost shared pointer to a PointCloud message
-        */
-      PCL_DEPRECATED ("[pcl::registration::GeneralizedIterativeClosestPoint::setInputCloud] setInputCloud is deprecated. Please use setInputSource instead.")
-      void
-      setInputCloud (const PointCloudSourceConstPtr &cloud);
 
       /** \brief Provide a pointer to the input dataset
         * \param cloud the const boost shared pointer to a PointCloud message

registration/include/pcl/registration/impl/correspondence_estimation.hpp

@@ -43,20 +43,6 @@
 #include <pcl/common/io.h>
 #include <pcl/common/copy_point.h>
 
-///////////////////////////////////////////////////////////////////////////////////////////
-template <typename PointSource, typename PointTarget, typename Scalar> void
-pcl::registration::CorrespondenceEstimationBase<PointSource, PointTarget, Scalar>::setInputCloud (const typename pcl::registration::CorrespondenceEstimationBase<PointSource, PointTarget, Scalar>::PointCloudSourceConstPtr &cloud)
-{
-  setInputSource (cloud); 
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////
-template <typename PointSource, typename PointTarget, typename Scalar> typename pcl::registration::CorrespondenceEstimationBase<PointSource, PointTarget, Scalar>::PointCloudSourceConstPtr const
-pcl::registration::CorrespondenceEstimationBase<PointSource, PointTarget, Scalar>::getInputCloud ()
-{
-  return (getInputSource ()); 
-}
-
 ///////////////////////////////////////////////////////////////////////////////////////////
 template <typename PointSource, typename PointTarget, typename Scalar> void
 pcl::registration::CorrespondenceEstimationBase<PointSource, PointTarget, Scalar>::setInputTarget (

registration/include/pcl/registration/impl/correspondence_rejection_sample_consensus.hpp

@@ -42,44 +42,6 @@
 
 #include <boost/unordered_map.hpp>
 
-///////////////////////////////////////////////////////////////////////////////////////////
-template <typename PointT> void
-pcl::registration::CorrespondenceRejectorSampleConsensus<PointT>::setInputCloud (
-    const typename pcl::registration::CorrespondenceRejectorSampleConsensus<PointT>::PointCloudConstPtr &cloud)
-{
-  setInputSource (cloud);
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////
-template <typename PointT> typename pcl::registration::CorrespondenceRejectorSampleConsensus<PointT>::PointCloudConstPtr const
-pcl::registration::CorrespondenceRejectorSampleConsensus<PointT>::getInputCloud ()
-{
-  return (getInputSource ()); 
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////
-template <typename PointT> void
-pcl::registration::CorrespondenceRejectorSampleConsensus<PointT>::setTargetCloud (
-    const typename pcl::registration::CorrespondenceRejectorSampleConsensus<PointT>::PointCloudConstPtr &cloud)
-{
-  setInputTarget (cloud);
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////
-template <typename PointT> void
-pcl::registration::CorrespondenceRejectorSampleConsensus<PointT>::setMaxIterations (
-    int max_iterations)
-{
-  setMaximumIterations (max_iterations);
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////
-template <typename PointT> int
-pcl::registration::CorrespondenceRejectorSampleConsensus<PointT>::getMaxIterations ()
-{
-  return (getMaximumIterations ());
-}
-
 ///////////////////////////////////////////////////////////////////////////////////////////
 template <typename PointT> void 
 pcl::registration::CorrespondenceRejectorSampleConsensus<PointT>::getRemainingCorrespondences (

registration/include/pcl/registration/impl/gicp.hpp

@@ -43,14 +43,6 @@
 #include <pcl/registration/boost.h>
 #include <pcl/registration/exceptions.h>
 
-///////////////////////////////////////////////////////////////////////////////////////////
-template <typename PointSource, typename PointTarget> void
-pcl::GeneralizedIterativeClosestPoint<PointSource, PointTarget>::setInputCloud (
-    const typename pcl::GeneralizedIterativeClosestPoint<PointSource, PointTarget>::PointCloudSourceConstPtr &cloud)
-{
-  setInputSource (cloud);
-}
-
 ////////////////////////////////////////////////////////////////////////////////////////
 template <typename PointSource, typename PointTarget>
 template<typename PointT> void

registration/include/pcl/registration/impl/registration.hpp

@@ -38,21 +38,6 @@
  *
  */
 
-///////////////////////////////////////////////////////////////////////////////////////////
-template <typename PointSource, typename PointTarget, typename Scalar> void
-pcl::Registration<PointSource, PointTarget, Scalar>::setInputCloud (
-    const typename pcl::Registration<PointSource, PointTarget, Scalar>::PointCloudSourceConstPtr &cloud)
-{
-  setInputSource (cloud);
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////
-template <typename PointSource, typename PointTarget, typename Scalar> typename pcl::Registration<PointSource, PointTarget, Scalar>::PointCloudSourceConstPtr const
-pcl::Registration<PointSource, PointTarget, Scalar>::getInputCloud ()
-{
-  return (getInputSource ());
-}
-
 ///////////////////////////////////////////////////////////////////////////////////////////
 template <typename PointSource, typename PointTarget, typename Scalar> inline void
 pcl::Registration<PointSource, PointTarget, Scalar>::setInputTarget (const PointCloudTargetConstPtr &cloud)

registration/include/pcl/registration/registration.h

@@ -174,20 +174,6 @@ namespace pcl
       void
       setCorrespondenceEstimation (const CorrespondenceEstimationPtr &ce) { correspondence_estimation_ = ce; }
 
-      /** \brief Provide a pointer to the input source 
-        * (e.g., the point cloud that we want to align to the target)
-        *
-        * \param[in] cloud the input point cloud source
-        */
-      PCL_DEPRECATED ("[pcl::registration::Registration::setInputCloud] setInputCloud is deprecated. Please use setInputSource instead.")
-      void
-      setInputCloud (const PointCloudSourceConstPtr &cloud);
-
-      /** \brief Get a pointer to the input point cloud dataset target. */
-      PCL_DEPRECATED ("[pcl::registration::Registration::getInputCloud] getInputCloud is deprecated. Please use getInputSource instead.")
-      PointCloudSourceConstPtr const
-      getInputCloud ();
-
       /** \brief Provide a pointer to the input source 
         * (e.g., the point cloud that we want to align to the target)
         *

test/registration/test_registration.cpp

@@ -162,11 +162,6 @@ TEST (PCL, IterativeClosestPoint)
 {
   IterativeClosestPoint<PointXYZ, PointXYZ> reg;
   PointCloud<PointXYZ>::ConstPtr source (cloud_source.makeShared ());
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-  reg.setInputCloud (source);     // test for PCL_DEPRECATED
-  source = reg.getInputCloud ();  // test for PCL_DEPRECATED
-#pragma GCC diagnostic pop
   reg.setInputSource (source);
   reg.setInputTarget (cloud_target.makeShared ());
   reg.setMaximumIterations (50);

test/registration/test_registration_api.cpp

@@ -131,11 +131,6 @@ TEST (PCL, CorrespondenceRejectorDistance)
   // re-do correspondence estimation
   boost::shared_ptr<pcl::Correspondences> correspondences (new pcl::Correspondences);
   pcl::registration::CorrespondenceEstimation<PointXYZ, PointXYZ> corr_est;
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-  corr_est.setInputCloud (source);        // test for PCL_DEPRECATED
-  source = corr_est.getInputCloud ();     // test for PCL_DEPRECATED
-#pragma GCC diagnostic pop
   corr_est.setInputSource (source);
   corr_est.setInputTarget (target);
   corr_est.determineCorrespondences (*correspondences);
@@ -237,11 +232,6 @@ TEST (PCL, CorrespondenceRejectorSampleConsensus)
 
   boost::shared_ptr<pcl::Correspondences> correspondences_result_rej_sac (new pcl::Correspondences);
   pcl::registration::CorrespondenceRejectorSampleConsensus<PointXYZ> corr_rej_sac;
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-  corr_rej_sac.setInputCloud (source);        // test for PCL_DEPRECATED
-  source = corr_rej_sac.getInputCloud ();     // test for PCL_DEPRECATED
-#pragma GCC diagnostic pop
   corr_rej_sac.setInputSource (source);
   corr_rej_sac.setInputTarget (target);
   corr_rej_sac.setInlierThreshold (rej_sac_max_dist);