fix warning in map_merge

mgou123 · Jan 3, 2021 · 74c0416 · 74c0416
1 parent ae92dec
commit 74c0416
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/map_merge/src/combine_grids/estimation_internal.h b/map_merge/src/combine_grids/estimation_internal.h
@@ -39,6 +39,8 @@
 
 #include <combine_grids/merging_pipeline.h>
 
+#include <cassert>
+
 #include <opencv2/core/utility.hpp>
 #include <opencv2/features2d.hpp>
 #include <opencv2/imgcodecs.hpp>
@@ -65,6 +67,9 @@ static inline cv::Ptr<cv::Feature2D> chooseFeatureFinder(FeatureType type)
       return cv::AKAZE::create();
 #endif
   }
+
+  assert(false);
+  return nullptr;
 }
 
 static inline void writeDebugMatchingInfo(

diff --git a/map_merge/src/combine_grids/merging_pipeline.cpp b/map_merge/src/combine_grids/merging_pipeline.cpp
@@ -73,7 +73,7 @@ bool MergingPipeline::estimateTransforms(FeatureType feature_type,
   for (const cv::Mat& image : images_) {
     image_features.emplace_back();
     if (!image.empty()) {
-      computeImageFeatures(finder, image, image_features.back());
+      cv::detail::computeImageFeatures(finder, image, image_features.back());
     }
   }