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 linemod compile errors #1836

Merged
merged 1 commit into from
May 30, 2017
Merged

Fix linemod compile errors #1836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
65 changes: 1 addition & 64 deletions recognition/include/pcl/recognition/color_gradient_dot_modality.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,75 +43,12 @@
#include <pcl/point_types.h>

#include <pcl/recognition/dot_modality.h>
#include <pcl/recognition/point_types.h>
#include <pcl/recognition/quantized_map.h>


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 <typename PointInT>
class ColorGradientDOTModality
: public DOTModality, public PCLBase<PointInT>
Expand Down
4 changes: 2 additions & 2 deletions recognition/include/pcl/recognition/dot_modality.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <vector>
#include <pcl/pcl_macros.h>
Expand Down
33 changes: 0 additions & 33 deletions recognition/include/pcl/recognition/point_types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand Down