Skip to content

Commit

Permalink
Merge pull request #5886 from Zekrom-7780/SemiColon_Changes
Browse files Browse the repository at this point in the history 
Semi-Colon Changes
  • Loading branch information
@mvieth
mvieth authored Nov 27, 2023
2 parents e212ce7 + 90e8bac commit 464f929
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 41 deletions.
2 changes: 1 addition & 1 deletion apps/include/pcl/apps/manual_registration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class ManualRegistration : public QMainWindow {
using CloudPtr = Cloud::Ptr;
using CloudConstPtr = Cloud::ConstPtr;

PCL_MAKE_ALIGNED_OPERATOR_NEW;
PCL_MAKE_ALIGNED_OPERATOR_NEW

ManualRegistration(float voxel_size);

Expand Down
69 changes: 34 additions & 35 deletions common/include/pcl/impl/point_types.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ namespace pcl

struct _PointXYZ
{
PCL_ADD_POINT4D; // This adds the members x,y,z which can also be accessed using the point (which is float[4])
PCL_ADD_POINT4D // This adds the members x,y,z which can also be accessed using the point (which is float[4])

PCL_MAKE_ALIGNED_OPERATOR_NEW
};
Expand All @@ -365,7 +365,7 @@ namespace pcl
#endif
struct _RGB
{
PCL_ADD_RGB;
PCL_ADD_RGB
};

PCL_EXPORTS std::ostream& operator << (std::ostream& os, const RGB& p);
Expand Down Expand Up @@ -401,7 +401,7 @@ namespace pcl

struct _Intensity
{
PCL_ADD_INTENSITY;
PCL_ADD_INTENSITY
};

PCL_EXPORTS std::ostream& operator << (std::ostream& os, const Intensity& p);
Expand Down Expand Up @@ -469,7 +469,7 @@ namespace pcl
*/
struct EIGEN_ALIGN16 _PointXYZI
{
PCL_ADD_POINT4D; // This adds the members x,y,z which can also be accessed using the point (which is float[4])
PCL_ADD_POINT4D // This adds the members x,y,z which can also be accessed using the point (which is float[4])
union
{
struct
Expand All @@ -496,7 +496,7 @@ namespace pcl

struct EIGEN_ALIGN16 _PointXYZL
{
PCL_ADD_POINT4D; // This adds the members x,y,z which can also be accessed using the point (which is float[4])
PCL_ADD_POINT4D // This adds the members x,y,z which can also be accessed using the point (which is float[4])
std::uint32_t label;
PCL_MAKE_ALIGNED_OPERATOR_NEW
};
Expand Down Expand Up @@ -527,8 +527,8 @@ namespace pcl

struct EIGEN_ALIGN16 _PointXYZRGBA
{
PCL_ADD_POINT4D; // This adds the members x,y,z which can also be accessed using the point (which is float[4])
PCL_ADD_RGB;
PCL_ADD_POINT4D // This adds the members x,y,z which can also be accessed using the point (which is float[4])
PCL_ADD_RGB
PCL_MAKE_ALIGNED_OPERATOR_NEW
};

Expand Down Expand Up @@ -574,15 +574,15 @@ namespace pcl

struct EIGEN_ALIGN16 _PointXYZRGB
{
PCL_ADD_POINT4D; // This adds the members x,y,z which can also be accessed using the point (which is float[4])
PCL_ADD_RGB;
PCL_ADD_POINT4D // This adds the members x,y,z which can also be accessed using the point (which is float[4])
PCL_ADD_RGB
PCL_MAKE_ALIGNED_OPERATOR_NEW
};

struct EIGEN_ALIGN16 _PointXYZRGBL
{
PCL_ADD_POINT4D; // This adds the members x,y,z which can also be accessed using the point (which is float[4])
PCL_ADD_RGB;
PCL_ADD_POINT4D // This adds the members x,y,z which can also be accessed using the point (which is float[4])
PCL_ADD_RGB
std::uint32_t label;
PCL_MAKE_ALIGNED_OPERATOR_NEW
};
Expand Down Expand Up @@ -666,7 +666,7 @@ namespace pcl

struct EIGEN_ALIGN16 _PointXYZLAB
{
PCL_ADD_POINT4D; // this adds the members x,y,z
PCL_ADD_POINT4D // this adds the members x,y,z
union
{
struct
Expand Down Expand Up @@ -701,7 +701,7 @@ namespace pcl

struct EIGEN_ALIGN16 _PointXYZHSV
{
PCL_ADD_POINT4D; // This adds the members x,y,z which can also be accessed using the point (which is float[4])
PCL_ADD_POINT4D // This adds the members x,y,z which can also be accessed using the point (which is float[4])
union
{
struct
Expand Down Expand Up @@ -787,7 +787,7 @@ namespace pcl
// @TODO: inheritance trick like on other PointTypes
struct EIGEN_ALIGN16 InterestPoint
{
PCL_ADD_POINT4D; // This adds the members x,y,z which can also be accessed using the point (which is float[4])
PCL_ADD_POINT4D // This adds the members x,y,z which can also be accessed using the point (which is float[4])
union
{
struct
Expand All @@ -803,7 +803,7 @@ namespace pcl

struct EIGEN_ALIGN16 _Normal
{
PCL_ADD_NORMAL4D; // This adds the member normal[3] which can also be accessed using the point (which is float[4])
PCL_ADD_NORMAL4D // This adds the member normal[3] which can also be accessed using the point (which is float[4])
union
{
struct
Expand Down Expand Up @@ -835,7 +835,7 @@ namespace pcl

struct EIGEN_ALIGN16 _Axis
{
PCL_ADD_NORMAL4D;
PCL_ADD_NORMAL4D
PCL_MAKE_ALIGNED_OPERATOR_NEW
};

Expand All @@ -858,8 +858,8 @@ namespace pcl

struct EIGEN_ALIGN16 _PointNormal
{
PCL_ADD_POINT4D; // This adds the members x,y,z which can also be accessed using the point (which is float[4])
PCL_ADD_NORMAL4D; // This adds the member normal[3] which can also be accessed using the point (which is float[4])
PCL_ADD_POINT4D // This adds the members x,y,z which can also be accessed using the point (which is float[4])
PCL_ADD_NORMAL4D // This adds the member normal[3] which can also be accessed using the point (which is float[4])
union
{
struct
Expand Down Expand Up @@ -893,18 +893,18 @@ namespace pcl

struct EIGEN_ALIGN16 _PointXYZRGBNormal
{
PCL_ADD_POINT4D; // This adds the members x,y,z which can also be accessed using the point (which is float[4])
PCL_ADD_NORMAL4D; // This adds the member normal[3] which can also be accessed using the point (which is float[4])
PCL_ADD_POINT4D // This adds the members x,y,z which can also be accessed using the point (which is float[4])
PCL_ADD_NORMAL4D // This adds the member normal[3] which can also be accessed using the point (which is float[4])
union
{
struct
{
PCL_ADD_UNION_RGB;
PCL_ADD_UNION_RGB
float curvature;
};
float data_c[4];
};
PCL_ADD_EIGEN_MAPS_RGB;
PCL_ADD_EIGEN_MAPS_RGB
PCL_MAKE_ALIGNED_OPERATOR_NEW
};

Expand Down Expand Up @@ -979,8 +979,8 @@ namespace pcl

struct EIGEN_ALIGN16 _PointXYZINormal
{
PCL_ADD_POINT4D; // This adds the members x,y,z which can also be accessed using the point (which is float[4])
PCL_ADD_NORMAL4D; // This adds the member normal[3] which can also be accessed using the point (which is float[4])
PCL_ADD_POINT4D // This adds the members x,y,z which can also be accessed using the point (which is float[4])
PCL_ADD_NORMAL4D // This adds the member normal[3] which can also be accessed using the point (which is float[4])
union
{
struct
Expand Down Expand Up @@ -1022,8 +1022,8 @@ namespace pcl
//----
struct EIGEN_ALIGN16 _PointXYZLNormal
{
PCL_ADD_POINT4D; // This adds the members x,y,z which can also be accessed using the point (which is float[4])
PCL_ADD_NORMAL4D; // This adds the member normal[3] which can also be accessed using the point (which is float[4])
PCL_ADD_POINT4D // This adds the members x,y,z which can also be accessed using the point (which is float[4])
PCL_ADD_NORMAL4D // This adds the member normal[3] which can also be accessed using the point (which is float[4])
union
{
struct
Expand Down Expand Up @@ -1067,7 +1067,7 @@ namespace pcl

struct EIGEN_ALIGN16 _PointWithRange
{
PCL_ADD_POINT4D; // This adds the members x,y,z which can also be accessed using the point (which is float[4])
PCL_ADD_POINT4D // This adds the members x,y,z which can also be accessed using the point (which is float[4])
union
{
struct
Expand Down Expand Up @@ -1098,7 +1098,7 @@ namespace pcl

struct EIGEN_ALIGN16 _PointWithViewpoint
{
PCL_ADD_POINT4D; // This adds the members x,y,z which can also be accessed using the point (which is float[4])
PCL_ADD_POINT4D // This adds the members x,y,z which can also be accessed using the point (which is float[4])
union
{
struct
Expand Down Expand Up @@ -1616,7 +1616,6 @@ namespace pcl
inline constexpr IntensityGradient (): IntensityGradient (0.f, 0.f, 0.f) {}

inline constexpr IntensityGradient (float _x, float _y, float _z): gradient_x (_x), gradient_y (_y), gradient_z (_z) {}

friend std::ostream& operator << (std::ostream& os, const IntensityGradient& p);
};

Expand All @@ -1633,7 +1632,7 @@ namespace pcl

struct EIGEN_ALIGN16 _PointWithScale
{
PCL_ADD_POINT4D; // This adds the members x,y,z which can also be accessed using the point (which is float[4])
PCL_ADD_POINT4D // This adds the members x,y,z which can also be accessed using the point (which is float[4])

union
{
Expand Down Expand Up @@ -1673,20 +1672,20 @@ namespace pcl

struct EIGEN_ALIGN16 _PointSurfel
{
PCL_ADD_POINT4D; // This adds the members x,y,z which can also be accessed using the point (which is float[4])
PCL_ADD_NORMAL4D; // This adds the member normal[3] which can also be accessed using the point (which is float[4])
PCL_ADD_POINT4D // This adds the members x,y,z which can also be accessed using the point (which is float[4])
PCL_ADD_NORMAL4D // This adds the member normal[3] which can also be accessed using the point (which is float[4])
union
{
struct
{
PCL_ADD_UNION_RGB;
PCL_ADD_UNION_RGB
float radius;
float confidence;
float curvature;
};
float data_c[4];
};
PCL_ADD_EIGEN_MAPS_RGB;
PCL_ADD_EIGEN_MAPS_RGB
PCL_MAKE_ALIGNED_OPERATOR_NEW
};

Expand Down Expand Up @@ -1717,7 +1716,7 @@ namespace pcl

struct EIGEN_ALIGN16 _PointDEM
{
PCL_ADD_POINT4D;
PCL_ADD_POINT4D
float intensity;
float intensity_variance;
float height_variance;
Expand Down
10 changes: 5 additions & 5 deletions tracking/include/pcl/tracking/impl/tracking.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
namespace pcl {
namespace tracking {
struct _ParticleXYZRPY {
PCL_ADD_POINT4D;
PCL_ADD_POINT4D
union {
struct {
float roll;
Expand Down Expand Up @@ -236,7 +236,7 @@ operator-(const ParticleXYZRPY& a, const ParticleXYZRPY& b)
namespace pcl {
namespace tracking {
struct _ParticleXYZR {
PCL_ADD_POINT4D;
PCL_ADD_POINT4D
union {
struct {
float roll;
Expand Down Expand Up @@ -420,7 +420,7 @@ operator-(const ParticleXYZR& a, const ParticleXYZR& b)
namespace pcl {
namespace tracking {
struct _ParticleXYRPY {
PCL_ADD_POINT4D;
PCL_ADD_POINT4D
union {
struct {
float roll;
Expand Down Expand Up @@ -610,7 +610,7 @@ operator-(const ParticleXYRPY& a, const ParticleXYRPY& b)
namespace pcl {
namespace tracking {
struct _ParticleXYRP {
PCL_ADD_POINT4D;
PCL_ADD_POINT4D
union {
struct {
float roll;
Expand Down Expand Up @@ -797,7 +797,7 @@ operator-(const ParticleXYRP& a, const ParticleXYRP& b)
namespace pcl {
namespace tracking {
struct _ParticleXYR {
PCL_ADD_POINT4D;
PCL_ADD_POINT4D
union {
struct {
float roll;
Expand Down

0 comments on commit 464f929

Please sign in to comment.