diff --git a/recognition/include/pcl/recognition/color_gradient_dot_modality.h b/recognition/include/pcl/recognition/color_gradient_dot_modality.h index cc9cd209040..a9a3ce753ce 100644 --- a/recognition/include/pcl/recognition/color_gradient_dot_modality.h +++ b/recognition/include/pcl/recognition/color_gradient_dot_modality.h @@ -43,75 +43,12 @@ #include #include +#include #include namespace pcl { - - /** \brief A point structure for representing RGB color - * \ingroup common - */ - struct EIGEN_ALIGN16 PointRGB - { - union - { - union - { - struct - { - uint8_t b; - uint8_t g; - uint8_t r; - uint8_t _unused; - }; - float rgb; - }; - uint32_t rgba; - }; - - inline PointRGB () - {} - - inline PointRGB (const uint8_t b, const uint8_t g, const uint8_t r) - : b (b), g (g), r (r), _unused (0) - {} - - EIGEN_MAKE_ALIGNED_OPERATOR_NEW - }; - - - /** \brief A point structure representing Euclidean xyz coordinates, and the intensity value. - * \ingroup common - */ - struct EIGEN_ALIGN16 GradientXY - { - union - { - struct - { - float x; - float y; - float angle; - float magnitude; - }; - float data[4]; - }; - EIGEN_MAKE_ALIGNED_OPERATOR_NEW - - inline bool operator< (const GradientXY & rhs) - { - return (magnitude > rhs.magnitude); - } - }; - inline std::ostream & operator << (std::ostream & os, const GradientXY & p) - { - os << "(" << p.x << "," << p.y << " - " << p.magnitude << ")"; - return (os); - } - - // -------------------------------------------------------------------------- - template class ColorGradientDOTModality : public DOTModality, public PCLBase diff --git a/recognition/include/pcl/recognition/dot_modality.h b/recognition/include/pcl/recognition/dot_modality.h index bf2a84a671e..0f66b922825 100644 --- a/recognition/include/pcl/recognition/dot_modality.h +++ b/recognition/include/pcl/recognition/dot_modality.h @@ -35,8 +35,8 @@ * */ -#ifndef PCL_FEATURES_QUANTIZABLE_MODALITY -#define PCL_FEATURES_QUANTIZABLE_MODALITY +#ifndef PCL_FEATURES_DOT_MODALITY +#define PCL_FEATURES_DOT_MODALITY #include #include diff --git a/recognition/include/pcl/recognition/point_types.h b/recognition/include/pcl/recognition/point_types.h index 8176a3898c0..869eca8b67c 100644 --- a/recognition/include/pcl/recognition/point_types.h +++ b/recognition/include/pcl/recognition/point_types.h @@ -45,39 +45,6 @@ namespace pcl { - - /** \brief A point structure for representing RGB color - * \ingroup common - */ - //struct EIGEN_ALIGN16 PointRGB - //{ - // union - // { - // union - // { - // struct - // { - // uint8_t b; - // uint8_t g; - // uint8_t r; - // uint8_t _unused; - // }; - // float rgb; - // }; - // uint32_t rgba; - // }; - - // inline PointRGB () - // {} - - // inline PointRGB (const uint8_t b, const uint8_t g, const uint8_t r) - // : b (b), g (g), r (r), _unused (0) - // {} - - // EIGEN_MAKE_ALIGNED_OPERATOR_NEW - //}; - - /** \brief A point structure representing Euclidean xyz coordinates, and the intensity value. * \ingroup common */