renamed to generic

alicevision · Sep 3, 2024 · a090e35 · a090e35
1 parent e9a4be5
commit a090e35
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 12 deletions.
diff --git a/src/aliceVision/feature/ImageDescriber.cpp b/src/aliceVision/feature/ImageDescriber.cpp
@@ -228,9 +228,9 @@ std::unique_ptr<ImageDescriber> createImageDescriber(EImageDescriberType imageDe
         case EImageDescriberType::AKAZE_LIOP:
             describerPtr.reset(new ImageDescriber_AKAZE(AKAZEParams(AKAZEOptions(), feature::AKAZE_LIOP)));
             break;
-        //Unknown descriptor to be used when the descriptor is computed outside of alicevsion
-        case EImageDescriberType::UNKNOWN:
-            describerPtr.reset(new UnknownImageDescriber());
+        //Generic descriptor to be used when the descriptor is computed outside of alicevsion
+        case EImageDescriberType::GENERIC:
+            describerPtr.reset(new GenericImageDescriber());
             break;
 
 #if ALICEVISION_IS_DEFINED(ALICEVISION_HAVE_CCTAG)

diff --git a/src/aliceVision/feature/ImageDescriber.hpp b/src/aliceVision/feature/ImageDescriber.hpp
@@ -10,7 +10,6 @@
 #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>
 
@@ -264,12 +263,12 @@ class ImageDescriber
 /**
  * @brief Used to load descripters computed outside of meshroom.
  */
-class UnknownImageDescriber  : public ImageDescriber
+class GenericImageDescriber  : public ImageDescriber
 {
   public:
-    UnknownImageDescriber() = default;
+    GenericImageDescriber() = default;
 
-    virtual ~UnknownImageDescriber() = default;
+    virtual ~GenericImageDescriber() = default;
 
      /**
      * @brief Check if the image describer use CUDA

diff --git a/src/aliceVision/feature/regionsFactory.hpp b/src/aliceVision/feature/regionsFactory.hpp
@@ -30,7 +30,7 @@ using AKAZE_Liop_Regions = ScalarRegions<unsigned char, 144>;
 using AKAZE_BinaryRegions = BinaryRegions<64>;
 
 /// Define an unknown feature regions 
-using UNKNOWN_Regions = ScalarRegions<float, 128>;
+using GENERIC_Regions = ScalarRegions<float, 128>;
 
 }  // namespace feature
 }  // namespace aliceVision
diff --git a/src/aliceVision/sfm/pipeline/regionsIO.cpp b/src/aliceVision/sfm/pipeline/regionsIO.cpp
@@ -26,7 +26,7 @@ using namespace sfmData;
 std::unique_ptr<feature::Regions> loadRegions(const std::vector<std::string>& folders, IndexT viewId, const feature::ImageDescriber& imageDescriber)
 {
     assert(!folders.empty());
-    
+
     const std::string imageDescriberTypeName = feature::EImageDescriberType_enumToString(imageDescriber.getDescriberType());
     const std::string basename = std::to_string(viewId);
 
@@ -228,7 +228,7 @@ bool loadRegionsPerView(feature::RegionsPerView& regionsPerView,
                     std::unique_ptr<feature::Regions> regionsPtr;
                     try
                     {
-                        regionsPtr = loadRegions(featuresFolders, iter->second.get()->getViewId(), *(imageDescribers.at(i)));                        
+                        regionsPtr = loadRegions(featuresFolders, iter->second.get()->getViewId(), *(imageDescribers.at(i)));
                     }
                     catch (const std::exception& e)
                     {

diff --git a/src/aliceVision/voctree/VocabularyTree.hpp b/src/aliceVision/voctree/VocabularyTree.hpp
@@ -360,8 +360,8 @@ inline std::unique_ptr<IVocabularyTree> createVoctreeForDescriberType(feature::E
         case EImageDescriberType::AKAZE_MLDB:
             res.reset(new VocabularyTree<AKAZE_BinaryRegions::DescriptorT>);
             break;
-        case EImageDescriberType::UNKNOWN:
-            res.reset(new VocabularyTree<UNKNOWN_Regions::DescriptorT>);
+        case EImageDescriberType::GENERIC:
+            res.reset(new VocabularyTree<GENERIC_Regions::DescriptorT>);
             break;
 
 #if ALICEVISION_IS_DEFINED(ALICEVISION_HAVE_CCTAG)