Add multirobot_map_merge

RoboStack · Apr 21, 2021 · 99bb83f · 99bb83f
1 parent 194cbc5
commit 99bb83f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/patch/ros-noetic-multirobot-map-merge.patch b/patch/ros-noetic-multirobot-map-merge.patch
@@ -0,0 +1,13 @@
+diff --git a/src/combine_grids/estimation_internal.h b/src/combine_grids/estimation_internal.h
+index 98c9428..5cd00fa 100644
+--- a/src/combine_grids/estimation_internal.h
++++ b/src/combine_grids/estimation_internal.h
+@@ -65,7 +65,7 @@ static inline cv::Ptr<cv::Feature2D> chooseFeatureFinder(FeatureType type)
+       return cv::ORB::create();
+     case FeatureType::SURF:
+ #ifdef HAVE_OPENCV_XFEATURES2D
+-      return xfeatures2d::SURF::create();
++      return cv::xfeatures2d::SURF::create();
+ #else
+       return cv::AKAZE::create();
+ #endif
diff --git a/vinca_linux_64.yaml b/vinca_linux_64.yaml
@@ -33,9 +33,10 @@ packages_select_by_deps:
   ##
   #  TODO Linux
   ##
-  - sick_tim
-  - kobuki_core
-  - sainsmart_relay_usb
+  - multirobot_map_merge
+  # - sick_tim
+  # - kobuki_core
+  # - sainsmart_relay_usb
   # - mqtt_bridge
   # - rtabmap
   # - mapviz_plugins