Removed Feature_Suppression_Distance function that is not used anywhere.

diff --git a/modules/features2d/src/akaze/AKAZEFeatures.cpp b/modules/features2d/src/akaze/AKAZEFeatures.cpp
index 0b201519bf01aec95669b93ffe9870217961a758..27d5692d3df00c3841f6c43ba5c4ed7db7cc5450 100644 (file)
--- a/modules/features2d/src/akaze/AKAZEFeatures.cpp
+++ b/modules/features2d/src/akaze/AKAZEFeatures.cpp
@@ -492,56 +492,6 @@ void AKAZEFeatures::Do_Subpixel_Refinement(std::vector<cv::KeyPoint>& kpts) {
     //timing_.subpixel = 1000.0*(t2 - t1) / cv::getTickFrequency();
 }
 
-/* ************************************************************************* */
-/**
- * @brief This method performs feature suppression based on 2D distance
- * @param kpts Vector of keypoints
- * @param mdist Maximum distance in pixels
- */
-void AKAZEFeatures::Feature_Suppression_Distance(std::vector<cv::KeyPoint>& kpts, float mdist) const {
-
-    vector<cv::KeyPoint> aux;
-    vector<size_t> to_delete;
-    float dist = 0.0, x1 = 0.0, y1 = 0.0, x2 = 0.0, y2 = 0.0;
-    bool found = false;
-
-    for (size_t i = 0; i < kpts.size(); i++) {
-        x1 = kpts[i].pt.x;
-        y1 = kpts[i].pt.y;
-        for (size_t j = i + 1; j < kpts.size(); j++) {
-            x2 = kpts[j].pt.x;
-            y2 = kpts[j].pt.y;
-            dist = sqrt(pow(x1 - x2, 2) + pow(y1 - y2, 2));
-            if (dist < mdist) {
-                if (fabs(kpts[i].response) >= fabs(kpts[j].response)) {
-                    to_delete.push_back(j);
-                }
-                else {
-                    to_delete.push_back(i);
-                    break;
-                }
-            }
-        }
-    }
-
-    for (size_t i = 0; i < kpts.size(); i++) {
-        found = false;
-        for (size_t j = 0; j < to_delete.size(); j++) {
-            if (i == to_delete[j]) {
-                found = true;
-                break;
-            }
-        }
-        if (found == false) {
-            aux.push_back(kpts[i]);
-        }
-    }
-
-    kpts.clear();
-    kpts = aux;
-    aux.clear();
-}
-
 /* ************************************************************************* */
 
 class SURF_Descriptor_Upright_64_Invoker : public cv::ParallelLoopBody

diff --git a/modules/features2d/src/akaze/AKAZEFeatures.h b/modules/features2d/src/akaze/AKAZEFeatures.h
index 389848c9bf53cd0fcddc20516f4260aed846e4b9..4bebc1673073ce6e1cb5bddc3df0f2c747f14037 100644 (file)
--- a/modules/features2d/src/akaze/AKAZEFeatures.h
+++ b/modules/features2d/src/akaze/AKAZEFeatures.h
@@ -46,7 +46,6 @@ public:
     void Compute_Multiscale_Derivatives(void);
     void Find_Scale_Space_Extrema(std::vector<cv::KeyPoint>& kpts);
     void Do_Subpixel_Refinement(std::vector<cv::KeyPoint>& kpts);
-    void Feature_Suppression_Distance(std::vector<cv::KeyPoint>& kpts, float mdist) const;
 
     // Feature description methods
     void Compute_Descriptors(std::vector<cv::KeyPoint>& kpts, cv::Mat& desc);

diff --git a/modules/features2d/src/kaze/KAZEFeatures.cpp b/modules/features2d/src/kaze/KAZEFeatures.cpp
index a3582af3f5cd33f261ccc659504bdbe38b3b853e..78348f833dcd2c982fa147f43d7f0bfd9df4e042 100644 (file)
--- a/modules/features2d/src/kaze/KAZEFeatures.cpp
+++ b/modules/features2d/src/kaze/KAZEFeatures.cpp
@@ -590,62 +590,6 @@ void KAZEFeatures::Do_Subpixel_Refinement(std::vector<cv::KeyPoint> &kpts) {
 //*************************************************************************************
 //*************************************************************************************
 
-/**
- * @brief This method performs feature suppression based on 2D distance
- * @param kpts Vector of keypoints
- * @param mdist Maximum distance in pixels
- */
-void KAZEFeatures::Feature_Suppression_Distance(std::vector<cv::KeyPoint>& kpts, const float& mdist) {
-
-    vector<KeyPoint> aux;
-    vector<size_t> to_delete;
-    float dist = 0.0, x1 = 0.0, y1 = 0.0, x2 = 0.0, y2 = 0.0;
-    bool found = false;
-
-    for (size_t i = 0; i < kpts.size(); i++) {
-        x1 = kpts[i].pt.x;
-        y1 = kpts[i].pt.y;
-
-        for (size_t j = i + 1; j < kpts.size(); j++) {
-            x2 = kpts[j].pt.x;
-            y2 = kpts[j].pt.y;
-            dist = sqrt(pow(x1 - x2, 2) + pow(y1 - y2, 2));
-
-            if (dist < mdist) {
-                if (fabs(kpts[i].response) >= fabs(kpts[j].response)) {
-                    to_delete.push_back(j);
-                }
-                else {
-                    to_delete.push_back(i);
-                    break;
-                }
-            }
-        }
-    }
-
-    for (size_t i = 0; i < kpts.size(); i++) {
-        found = false;
-
-        for (size_t j = 0; j < to_delete.size(); j++) {
-            if (i == to_delete[j]) {
-                found = true;
-                break;
-            }
-        }
-
-        if (found == false) {
-            aux.push_back(kpts[i]);
-        }
-    }
-
-    kpts.clear();
-    kpts = aux;
-    aux.clear();
-}
-
-//*************************************************************************************
-//*************************************************************************************
-
 /**
  * @brief This method  computes the set of descriptors through the nonlinear scale space
  * @param kpts Vector of keypoints

diff --git a/modules/features2d/src/kaze/KAZEFeatures.h b/modules/features2d/src/kaze/KAZEFeatures.h
index 3f845e193e8d5e7eaaaf4bd4d7313e76dd5e2000..c901561240a41d285a930a8a883bb0ab15be44f1 100644 (file)
--- a/modules/features2d/src/kaze/KAZEFeatures.h
+++ b/modules/features2d/src/kaze/KAZEFeatures.h
@@ -84,7 +84,6 @@ private:
   void Determinant_Hessian_Parallel(std::vector<cv::KeyPoint>& kpts);
   void Find_Extremum_Threading(const int& level);
   void Do_Subpixel_Refinement(std::vector<cv::KeyPoint>& kpts);
-  void Feature_Suppression_Distance(std::vector<cv::KeyPoint>& kpts, const float& mdist);
 
   // AOS Methods
   void AOS_Step_Scalar(cv::Mat &Ld, const cv::Mat &Ldprev, const cv::Mat &c, const float& stepsize);