Fixed build with pcl 1.11 (#550). Fixed pcl 1.11 warnings (boost->std).

This commit is contained in:
matlabbe
2020-05-27 16:35:33 -04:00
parent ae5ce029d6
commit 511be5f663
10 changed files with 54 additions and 2 deletions

View File

@@ -69,10 +69,17 @@ public:
const Transform & localTransform = Transform::getIdentity());
virtual ~CameraOpenni();
#ifdef RTABMAP_OPENNI
#if PCL_VERSION_COMPARE(>=, 1, 11, 0)
void image_cb (
const std::shared_ptr<openni_wrapper::Image>& rgb,
const std::shared_ptr<openni_wrapper::DepthImage>& depth,
float constant);
#else
void image_cb (
const boost::shared_ptr<openni_wrapper::Image>& rgb,
const boost::shared_ptr<openni_wrapper::DepthImage>& depth,
float constant);
#endif
#endif
virtual bool init(const std::string & calibrationFolder = ".", const std::string & cameraName = "");