Permalink
Browse files

Remove depreciation warning from sample_size_pairs

This warning floods build output because the variable is used below in
SAC_SAMPLE_SIZE. Even though the latter is never used throughout PCL
code base, inclusion of the header is sufficient to trigger the warning.

This commit does not touch the depreciation warning of SAC_SAMPLE_SIZE,
so anyone who happens to use the old model size determination system
will still be notified.
  • Loading branch information...
1 parent 887b3ea commit aca672bb66be9c231186105aa603e611b6e9aeaf @taketwo taketwo committed Nov 9, 2015
Showing with 20 additions and 22 deletions.
  1. +20 −22 sample_consensus/include/pcl/sample_consensus/model_types.h
@@ -69,28 +69,26 @@ namespace pcl
}
typedef std::map<pcl::SacModel, unsigned int>::value_type SampleSizeModel;
-const static SampleSizeModel
-PCL_DEPRECATED("This array is deprecated and is kept only to prevent breaking "
- "existing user code. Starting from PCL 1.8.0 model sample size "
- "is a protected member of the SampleConsensusModel class")
-sample_size_pairs[] = {SampleSizeModel (pcl::SACMODEL_PLANE, 3),
- SampleSizeModel (pcl::SACMODEL_LINE, 2),
- SampleSizeModel (pcl::SACMODEL_CIRCLE2D, 3),
- SampleSizeModel (pcl::SACMODEL_CIRCLE3D, 3),
- SampleSizeModel (pcl::SACMODEL_SPHERE, 4),
- SampleSizeModel (pcl::SACMODEL_CYLINDER, 2),
- SampleSizeModel (pcl::SACMODEL_CONE, 3),
- //SampleSizeModel (pcl::SACMODEL_TORUS, 2),
- SampleSizeModel (pcl::SACMODEL_PARALLEL_LINE, 2),
- SampleSizeModel (pcl::SACMODEL_PERPENDICULAR_PLANE, 3),
- //SampleSizeModel (pcl::PARALLEL_LINES, 2),
- SampleSizeModel (pcl::SACMODEL_NORMAL_PLANE, 3),
- SampleSizeModel (pcl::SACMODEL_NORMAL_SPHERE, 4),
- SampleSizeModel (pcl::SACMODEL_REGISTRATION, 3),
- SampleSizeModel (pcl::SACMODEL_REGISTRATION_2D, 3),
- SampleSizeModel (pcl::SACMODEL_PARALLEL_PLANE, 3),
- SampleSizeModel (pcl::SACMODEL_NORMAL_PARALLEL_PLANE, 3),
- SampleSizeModel (pcl::SACMODEL_STICK, 2)};
+// Warning: sample_size_pairs is deprecated and is kept only to prevent breaking existing user code.
+// Starting from PCL 1.8.0 model sample size is a protected member of the SampleConsensusModel class.
+const static SampleSizeModel sample_size_pairs[] = {SampleSizeModel (pcl::SACMODEL_PLANE, 3),
+ SampleSizeModel (pcl::SACMODEL_LINE, 2),
+ SampleSizeModel (pcl::SACMODEL_CIRCLE2D, 3),
+ SampleSizeModel (pcl::SACMODEL_CIRCLE3D, 3),
+ SampleSizeModel (pcl::SACMODEL_SPHERE, 4),
+ SampleSizeModel (pcl::SACMODEL_CYLINDER, 2),
+ SampleSizeModel (pcl::SACMODEL_CONE, 3),
+ //SampleSizeModel (pcl::SACMODEL_TORUS, 2),
+ SampleSizeModel (pcl::SACMODEL_PARALLEL_LINE, 2),
+ SampleSizeModel (pcl::SACMODEL_PERPENDICULAR_PLANE, 3),
+ //SampleSizeModel (pcl::PARALLEL_LINES, 2),
+ SampleSizeModel (pcl::SACMODEL_NORMAL_PLANE, 3),
+ SampleSizeModel (pcl::SACMODEL_NORMAL_SPHERE, 4),
+ SampleSizeModel (pcl::SACMODEL_REGISTRATION, 3),
+ SampleSizeModel (pcl::SACMODEL_REGISTRATION_2D, 3),
+ SampleSizeModel (pcl::SACMODEL_PARALLEL_PLANE, 3),
+ SampleSizeModel (pcl::SACMODEL_NORMAL_PARALLEL_PLANE, 3),
+ SampleSizeModel (pcl::SACMODEL_STICK, 2)};
namespace pcl
{

0 comments on commit aca672b

Please sign in to comment.