Merged master -> ros2

This commit is contained in:
matlabbe
2021-10-06 10:09:00 -04:00
3 changed files with 11 additions and 4 deletions
+8 -1
View File
@@ -543,7 +543,14 @@ void CommonDataSubscriber::setupRGBDCallbacks(
{
RCLCPP_INFO(node.get_logger(), "Setup rgbd callback");
if(subscribeOdom || subscribeUserData || subscribeScan2d || subscribeScan3d || subscribeOdomInfo)
if(subscribeOdom ||
#ifdef RTABMAP_SYNC_USER_DATA
subscribeUserData ||
#endif
subscribeScan2d ||
subscribeScan3d ||
subscribeScanDesc ||
subscribeOdomInfo)
{
rgbdSubs_.resize(1);
rgbdSubs_[0] = new message_filters::Subscriber<rtabmap_ros::msg::RGBDImage>;