modifications for generic feature type

alicevision · Sep 4, 2024 · 24434a9 · 24434a9
1 parent a090e35
commit 24434a9
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/src/aliceVision/feature/ImageDescriber.hpp b/src/aliceVision/feature/ImageDescriber.hpp
@@ -10,6 +10,7 @@
 #include <aliceVision/numeric/numeric.hpp>
 #include <aliceVision/feature/imageDescriberCommon.hpp>
 #include <aliceVision/feature/Regions.hpp>
+#include <aliceVision/feature/regionsFactory.hpp>
 #include <aliceVision/image/Image.hpp>
 #include <memory>
 
@@ -286,7 +287,7 @@ class GenericImageDescriber  : public ImageDescriber
      * @brief Get the corresponding EImageDescriberType
      * @return EImageDescriberType
      */
-    EImageDescriberType getDescriberType() const override { return EImageDescriberType::UNKNOWN; }
+    EImageDescriberType getDescriberType() const override { return EImageDescriberType::GENERIC; }
 
     /**
      * @brief Get the total amount of RAM needed for a
@@ -362,7 +363,7 @@ class GenericImageDescriber  : public ImageDescriber
      */
     void allocate(std::unique_ptr<Regions>& regions) const override 
     {
-        regions.reset(new UNKNOWN_Regions);
+        regions.reset(new GENERIC_Regions);
     }
 
   private:

diff --git a/src/aliceVision/feature/imageDescriberCommon.cpp b/src/aliceVision/feature/imageDescriberCommon.cpp
@@ -61,6 +61,8 @@ std::string EImageDescriberType_enumToString(EImageDescriberType imageDescriberT
             return "akaze_liop";
         case EImageDescriberType::AKAZE_MLDB:
             return "akaze_mldb";
+        case EImageDescriberType::GENERIC:
+            return "generic";
 
 #if ALICEVISION_IS_DEFINED(ALICEVISION_HAVE_CCTAG)
         case EImageDescriberType::CCTAG3:
@@ -113,6 +115,9 @@ EImageDescriberType EImageDescriberType_stringToEnum(const std::string& imageDes
     if (type == "akaze_mldb")
         return EImageDescriberType::AKAZE_MLDB;
 
+    if (type == "generic")
+        return EImageDescriberType::GENERIC;
+
 #if ALICEVISION_IS_DEFINED(ALICEVISION_HAVE_CCTAG)
     if (type == "cctag3")
         return EImageDescriberType::CCTAG3;

diff --git a/src/aliceVision/feature/imageDescriberCommon.hpp b/src/aliceVision/feature/imageDescriberCommon.hpp
@@ -27,7 +27,9 @@ enum class EImageDescriberType : unsigned char
 
     AKAZE = 20,
     AKAZE_LIOP = 21,
-    AKAZE_MLDB = 22
+    AKAZE_MLDB = 22,
+
+    GENERIC = 100
 
 #if ALICEVISION_IS_DEFINED(ALICEVISION_HAVE_CCTAG)
     ,
@@ -111,7 +113,8 @@ inline float getStrongSupportCoeff(EImageDescriberType imageDescriberType)
         case EImageDescriberType::AKAZE_LIOP:
         case EImageDescriberType::AKAZE_MLDB:
             return 0.14f;
-
+        case EImageDescriberType::GENERIC:
+            return -1.0f;
 #if ALICEVISION_IS_DEFINED(ALICEVISION_HAVE_CCTAG)
         case EImageDescriberType::CCTAG3:
         case EImageDescriberType::CCTAG4:

diff --git a/src/aliceVision/matching/svgVisualization.cpp b/src/aliceVision/matching/svgVisualization.cpp
@@ -36,6 +36,10 @@ std::string describerTypeColor(feature::EImageDescriberType descType)
             return "purple";
         case feature::EImageDescriberType::AKAZE_MLDB:
             return "purple";
+
+        case feature::EImageDescriberType::GENERIC:
+            return "black";
+
 #if ALICEVISION_IS_DEFINED(ALICEVISION_HAVE_CCTAG)
         case feature::EImageDescriberType::CCTAG3:
             return "blue";