FIX: OpenCV SIFT API

This commit fixes some API changes likely introduced by switching to OpenCV 4 (namespace change for SIFT). Furthermore, this fixes a virtual function override mismatch, which caused a compiler error at least on macOS. As this only appears with -DALICEVISION_USE_OCVSIFT=ON (which is not the default), this was probably not caught in CI.

Signed-off-by: Philipp Remy <[email protected]>

Author: philippremy

src/aliceVision/feature/openCV/ImageDescriber_SIFT_OCV.cpp

@@ -18,9 +18,9 @@
 namespace aliceVision {
 namespace feature {
 
-void SIFT_openCV_Params::setConfigurationPreset(EImageDescriberPreset preset)
+void SIFT_openCV_Params::setConfigurationPreset(ConfigurationPreset preset)
 {
-    switch (preset)
+    switch (preset.descPreset)
     {
         case EImageDescriberPreset::LOW:
             contrastThreshold = 0.01;
@@ -67,7 +67,7 @@ bool ImageDescriber_SIFT_openCV::describe(const image::Image<unsigned char>& ima
             maxDetect = _params.maxTotalKeypoints;
 
     cv::Ptr<cv::Feature2D> siftdetector =
-      cv::xfeatures2d::SIFT::create(maxDetect, _params.nOctaveLayers, _params.contrastThreshold, _params.edgeThreshold, _params.sigma);
+      cv::SIFT::create(maxDetect, _params.nOctaveLayers, _params.contrastThreshold, _params.edgeThreshold, _params.sigma);
 
     // Detect SIFT keypoints
     auto detect_start = std::chrono::steady_clock::now();

src/aliceVision/feature/openCV/ImageDescriber_SIFT_OCV.hpp

@@ -30,7 +30,7 @@ class SIFT_openCV_Params
      * @param[in] preset The preset configuration
      * @return True if configuration succeed.
      */
-    void setConfigurationPreset(EImageDescriberPreset preset);
+    void setConfigurationPreset(ConfigurationPreset preset);
 
     /// Parameters
     std::size_t gridSize = 4;
@@ -84,7 +84,7 @@ class ImageDescriber_SIFT_openCV : public ImageDescriber
      * @param[in] preset The preset configuration
      * @return True if configuration succeed.
      */
-    void setConfigurationPreset(EImageDescriberPreset preset) override { _params.setConfigurationPreset(preset); }
+    void setConfigurationPreset(ConfigurationPreset preset) override { _params.setConfigurationPreset(preset); }
 
     /**
      * @brief Detect regions on the 8-bit image and compute their attributes (description)