Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix EIGEN_ALIGN16 positionining for point type XYZHSV #3237

Merged
merged 4 commits into from
Jul 18, 2019
Merged

Fix EIGEN_ALIGN16 positionining for point type XYZHSV #3237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
257b9ca
Corrected EIGEN_ALIGN16 positionining for point type XYZHSV
Jul 16, 2019
f99e0f5
Merge branch 'master' into point_types/eigen_alignas
dooxe Jul 16, 2019
ed9ebac
Update convolution.h
dooxe Jul 17, 2019
e3097d8
Update implicit_shape_model.h
dooxe Jul 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions 2d/include/pcl/2d/convolution.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,15 @@ namespace pcl
/**
* This typedef is used to represent a point cloud containing edge information
*/
struct PointXYZIEdge
struct EIGEN_ALIGN16 PointXYZIEdge
{
PCL_ADD_POINT4D; // preferred way of adding a XYZ+padding
float magnitude;
float direction;
float magnitude_x;
float magnitude_y;
PCL_MAKE_ALIGNED_OPERATOR_NEW // make sure our new allocators are aligned
} EIGEN_ALIGN16; // enforce SSE padding for correct memory alignment
}; // enforce SSE padding for correct memory alignment

/** \brief A 2D convolution class. */
template <typename PointT>
Expand Down
4 changes: 2 additions & 2 deletions common/include/pcl/impl/point_types.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -681,7 +681,7 @@ namespace pcl
};


struct _PointXYZHSV
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])
union
Expand All @@ -695,7 +695,7 @@ namespace pcl
float data_c[4];
};
PCL_MAKE_ALIGNED_OPERATOR_NEW
} EIGEN_ALIGN16;
};

PCL_EXPORTS std::ostream& operator << (std::ostream& os, const PointXYZHSV& p);
struct EIGEN_ALIGN16 PointXYZHSV : public _PointXYZHSV
Expand Down
4 changes: 2 additions & 2 deletions recognition/include/pcl/recognition/implicit_shape_model.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
namespace pcl
{
/** \brief This struct is used for storing peak. */
struct ISMPeak
struct EIGEN_ALIGN16 ISMPeak
{
/** \brief Point were this peak is located. */
PCL_ADD_POINT4D;
Expand All @@ -65,7 +65,7 @@ namespace pcl
int class_id;

PCL_MAKE_ALIGNED_OPERATOR_NEW
} EIGEN_ALIGN16;
};

namespace features
{
Expand Down