Skip to content

Commit 4cca66c

Browse files
gnawmegnawme
authored
Added modernize-use-bool-literals, modernize-use-default-member-init clang-tidy checks (#5665)
* First set of modernize-use-default-member-init changes * Fixed issues found by inspection
1 parent 3d4fd2f commit 4cca66c

File tree

12 files changed

+88
-105
lines changed

12 files changed

+88
-105
lines changed

‎2d/include/pcl/2d/edge.h

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -116,25 +116,16 @@ class Edge {
116116
private:
117117
OUTPUT_TYPE output_type_;
118118
DETECTOR_KERNEL_TYPE detector_kernel_type_;
119-
bool non_maximal_suppression_;
120-
bool hysteresis_thresholding_;
119+
bool non_maximal_suppression_{false};
120+
bool hysteresis_thresholding_{false};
121121

122-
float hysteresis_threshold_low_;
123-
float hysteresis_threshold_high_;
124-
float non_max_suppression_radius_x_;
125-
float non_max_suppression_radius_y_;
122+
float hysteresis_threshold_low_{20};
123+
float hysteresis_threshold_high_{80};
124+
float non_max_suppression_radius_x_{3};
125+
float non_max_suppression_radius_y_{3};
126126

127127
public:
128-
Edge()
129-
: output_type_(OUTPUT_X)
130-
, detector_kernel_type_(SOBEL)
131-
, non_maximal_suppression_(false)
132-
, hysteresis_thresholding_(false)
133-
, hysteresis_threshold_low_(20)
134-
, hysteresis_threshold_high_(80)
135-
, non_max_suppression_radius_x_(3)
136-
, non_max_suppression_radius_y_(3)
137-
{}
128+
Edge() : output_type_(OUTPUT_X), detector_kernel_type_(SOBEL) {}
138129

139130
/** \brief Set the output type.
140131
* \param[in] output_type the output type

‎2d/include/pcl/2d/kernel.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,11 @@ class kernel {
6363
GAUSSIAN //!< GAUSSIAN
6464
};
6565

66-
int kernel_size_;
67-
float sigma_;
66+
int kernel_size_{3};
67+
float sigma_{1.0};
6868
KERNEL_ENUM kernel_type_;
6969

70-
kernel() : kernel_size_(3), sigma_(1.0), kernel_type_(GAUSSIAN) {}
70+
kernel() : kernel_type_(GAUSSIAN) {}
7171

7272
/**
7373
*

‎common/include/pcl/common/bivariate_polynomial.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,10 @@ namespace pcl
114114
getNoOfParametersFromDegree (int n) { return ((n+2)* (n+1))/2;}
115115

116116
//-----VARIABLES-----
117-
int degree;
118-
real* parameters;
119-
BivariatePolynomialT<real>* gradient_x, * gradient_y;
117+
int degree{0};
118+
real* parameters{nullptr};
119+
BivariatePolynomialT<real>* gradient_x{nullptr};
120+
BivariatePolynomialT<real>* gradient_y{nullptr};
120121

121122
protected:
122123
//-----METHODS-----

‎common/include/pcl/common/centroid.h

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -89,18 +89,18 @@ namespace pcl
8989
* \ingroup common
9090
*/
9191
template <typename PointT, typename Scalar> inline unsigned int
92-
compute3DCentroid (const pcl::PointCloud<PointT> &cloud,
92+
compute3DCentroid (const pcl::PointCloud<PointT> &cloud,
9393
Eigen::Matrix<Scalar, 4, 1> &centroid);
9494

9595
template <typename PointT> inline unsigned int
96-
compute3DCentroid (const pcl::PointCloud<PointT> &cloud,
96+
compute3DCentroid (const pcl::PointCloud<PointT> &cloud,
9797
Eigen::Vector4f &centroid)
9898
{
9999
return (compute3DCentroid <PointT, float> (cloud, centroid));
100100
}
101101

102102
template <typename PointT> inline unsigned int
103-
compute3DCentroid (const pcl::PointCloud<PointT> &cloud,
103+
compute3DCentroid (const pcl::PointCloud<PointT> &cloud,
104104
Eigen::Vector4d &centroid)
105105
{
106106
return (compute3DCentroid <PointT, double> (cloud, centroid));
@@ -844,8 +844,7 @@ namespace pcl
844844
using Pod = typename traits::POD<PointT>::type;
845845

846846
NdCentroidFunctor (const PointT &p, Eigen::Matrix<Scalar, Eigen::Dynamic, 1> &centroid)
847-
: f_idx_ (0),
848-
centroid_ (centroid),
847+
: centroid_ (centroid),
849848
p_ (reinterpret_cast<const Pod&>(p)) { }
850849

851850
template<typename Key> inline void operator() ()
@@ -865,7 +864,7 @@ namespace pcl
865864
}
866865

867866
private:
868-
int f_idx_;
867+
int f_idx_{0};
869868
Eigen::Matrix<Scalar, Eigen::Dynamic, 1> &centroid_;
870869
const Pod &p_;
871870
};
@@ -877,18 +876,18 @@ namespace pcl
877876
* \ingroup common
878877
*/
879878
template <typename PointT, typename Scalar> inline void
880-
computeNDCentroid (const pcl::PointCloud<PointT> &cloud,
879+
computeNDCentroid (const pcl::PointCloud<PointT> &cloud,
881880
Eigen::Matrix<Scalar, Eigen::Dynamic, 1> &centroid);
882881

883882
template <typename PointT> inline void
884-
computeNDCentroid (const pcl::PointCloud<PointT> &cloud,
883+
computeNDCentroid (const pcl::PointCloud<PointT> &cloud,
885884
Eigen::VectorXf &centroid)
886885
{
887886
return (computeNDCentroid<PointT, float> (cloud, centroid));
888887
}
889888

890889
template <typename PointT> inline void
891-
computeNDCentroid (const pcl::PointCloud<PointT> &cloud,
890+
computeNDCentroid (const pcl::PointCloud<PointT> &cloud,
892891
Eigen::VectorXd &centroid)
893892
{
894893
return (computeNDCentroid<PointT, double> (cloud, centroid));
@@ -907,15 +906,15 @@ namespace pcl
907906
Eigen::Matrix<Scalar, Eigen::Dynamic, 1> &centroid);
908907

909908
template <typename PointT> inline void
910-
computeNDCentroid (const pcl::PointCloud<PointT> &cloud,
909+
computeNDCentroid (const pcl::PointCloud<PointT> &cloud,
911910
const Indices &indices,
912911
Eigen::VectorXf &centroid)
913912
{
914913
return (computeNDCentroid<PointT, float> (cloud, indices, centroid));
915914
}
916915

917916
template <typename PointT> inline void
918-
computeNDCentroid (const pcl::PointCloud<PointT> &cloud,
917+
computeNDCentroid (const pcl::PointCloud<PointT> &cloud,
919918
const Indices &indices,
920919
Eigen::VectorXd &centroid)
921920
{
@@ -935,15 +934,15 @@ namespace pcl
935934
Eigen::Matrix<Scalar, Eigen::Dynamic, 1> &centroid);
936935

937936
template <typename PointT> inline void
938-
computeNDCentroid (const pcl::PointCloud<PointT> &cloud,
937+
computeNDCentroid (const pcl::PointCloud<PointT> &cloud,
939938
const pcl::PointIndices &indices,
940939
Eigen::VectorXf &centroid)
941940
{
942941
return (computeNDCentroid<PointT, float> (cloud, indices, centroid));
943942
}
944943

945944
template <typename PointT> inline void
946-
computeNDCentroid (const pcl::PointCloud<PointT> &cloud,
945+
computeNDCentroid (const pcl::PointCloud<PointT> &cloud,
947946
const pcl::PointIndices &indices,
948947
Eigen::VectorXd &centroid)
949948
{

‎common/include/pcl/common/impl/bivariate_polynomial.hpp

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,14 @@ namespace pcl
5252
{
5353

5454
template<typename real>
55-
BivariatePolynomialT<real>::BivariatePolynomialT (int new_degree) :
56-
degree(0), parameters(nullptr), gradient_x(nullptr), gradient_y(nullptr)
55+
BivariatePolynomialT<real>::BivariatePolynomialT (int new_degree)
5756
{
5857
setDegree(new_degree);
5958
}
6059

6160

6261
template<typename real>
63-
BivariatePolynomialT<real>::BivariatePolynomialT (const BivariatePolynomialT& other) :
64-
degree(0), parameters(NULL), gradient_x(NULL), gradient_y(NULL)
62+
BivariatePolynomialT<real>::BivariatePolynomialT (const BivariatePolynomialT& other)
6563
{
6664
deepCopy (other);
6765
}
@@ -140,11 +138,11 @@ BivariatePolynomialT<real>::deepCopy (const pcl::BivariatePolynomialT<real>& oth
140138
template<typename real> void
141139
BivariatePolynomialT<real>::calculateGradient (bool forceRecalc)
142140
{
143-
if (gradient_x!=NULL && !forceRecalc) return;
141+
if (gradient_x!=nullptr && !forceRecalc) return;
144142

145-
if (gradient_x == NULL)
143+
if (gradient_x == nullptr)
146144
gradient_x = new pcl::BivariatePolynomialT<real> (degree-1);
147-
if (gradient_y == NULL)
145+
if (gradient_y == nullptr)
148146
gradient_y = new pcl::BivariatePolynomialT<real> (degree-1);
149147

150148
unsigned int parameterPosDx=0, parameterPosDy=0;

0 commit comments

Comments
 (0)