Rename KAZE to KAZEFeatures to fix MSVS x64 compiler error (Duplicate file name confu...

diff --git a/modules/features2d/src/akaze.cpp b/modules/features2d/src/akaze.cpp
index 7a0ac72..7b028cc 100644 (file)
--- a/modules/features2d/src/akaze.cpp
+++ b/modules/features2d/src/akaze.cpp
@@ -49,7 +49,7 @@ http://www.robesafe.com/personal/pablo.alcantarilla/papers/Alcantarilla13bmvc.pd
 */
 
 #include "precomp.hpp"
-#include "akaze/AKAZE.h"
+#include "akaze/AKAZEFeatures.h"
 
 namespace cv
 {

diff --git a/modules/features2d/src/akaze/AKAZE.cpp b/modules/features2d/src/akaze/AKAZEFeatures.cpp
similarity index 99%
rename from modules/features2d/src/akaze/AKAZE.cpp
rename to modules/features2d/src/akaze/AKAZEFeatures.cpp
index 84d33d5..527abad 100644 (file)
--- a/modules/features2d/src/akaze/AKAZE.cpp
+++ b/modules/features2d/src/akaze/AKAZEFeatures.cpp
@@ -6,7 +6,7 @@
  * @author Pablo F. Alcantarilla, Jesus Nuevo
  */
 
-#include "AKAZE.h"
+#include "AKAZEFeatures.h"
 #include "fed.h"
 #include "nldiffusion_functions.h"
 

diff --git a/modules/features2d/src/akaze/AKAZE.h b/modules/features2d/src/akaze/AKAZEFeatures.h
similarity index 100%
rename from modules/features2d/src/akaze/AKAZE.h
rename to modules/features2d/src/akaze/AKAZEFeatures.h

diff --git a/modules/features2d/src/kaze.cpp b/modules/features2d/src/kaze.cpp
index d975eae..e5b9354 100644 (file)
--- a/modules/features2d/src/kaze.cpp
+++ b/modules/features2d/src/kaze.cpp
@@ -48,7 +48,7 @@ http://www.robesafe.com/personal/pablo.alcantarilla/papers/Alcantarilla12eccv.pd
 */
 
 #include "precomp.hpp"
-#include "kaze/KAZE.h"
+#include "kaze/KAZEFeatures.h"
 
 namespace cv
 {

diff --git a/modules/features2d/src/kaze/KAZE.cpp b/modules/features2d/src/kaze/KAZEFeatures.cpp
similarity index 99%
rename from modules/features2d/src/kaze/KAZE.cpp
rename to modules/features2d/src/kaze/KAZEFeatures.cpp
index f1d0dc7..0fe41ae 100644 (file)
--- a/modules/features2d/src/kaze/KAZE.cpp
+++ b/modules/features2d/src/kaze/KAZEFeatures.cpp
@@ -14,14 +14,14 @@
 //=============================================================================
 
 /**
- * @file KAZE.cpp
+ * @file KAZEFeatures.cpp
  * @brief Main class for detecting and describing features in a nonlinear
  * scale space
  * @date Jan 21, 2012
  * @author Pablo F. Alcantarilla
  */
 
-#include "KAZE.h"
+#include "KAZEFeatures.h"
 
 // Namespaces
 using namespace std;
@@ -381,20 +381,20 @@ void KAZEFeatures::Determinant_Hessian_Parallel(std::vector<cv::KeyPoint>& kpts)
 #ifdef _OPENMP
 #pragma omp parallel for
 #endif
-    for (int i = 1; i < evolution_.size() - 1; i++) {
+    for (int i = 1; i < (int)evolution_.size() - 1; i++) {
         Find_Extremum_Threading(i);
     }
 
     // Now fill the vector of keypoints!!!
-    for (int i = 0; i < kpts_par_.size(); i++) {
-        for (int j = 0; j < kpts_par_[i].size(); j++) {
+    for (int i = 0; i < (int)kpts_par_.size(); i++) {
+        for (int j = 0; j < (int)kpts_par_[i].size(); j++) {
             level = i + 1;
             is_extremum = true;
             is_repeated = false;
             is_out = false;
 
             // Check in case we have the same point as maxima in previous evolution levels
-            for (int ik = 0; ik < kpts.size(); ik++) {
+            for (int ik = 0; ik < (int)kpts.size(); ik++) {
                 if (kpts[ik].class_id == level || kpts[ik].class_id == level + 1 || kpts[ik].class_id == level - 1) {
                     dist = pow(kpts_par_[i][j].pt.x - kpts[ik].pt.x, 2) + pow(kpts_par_[i][j].pt.y - kpts[ik].pt.y, 2);
 

diff --git a/modules/features2d/src/kaze/KAZE.h b/modules/features2d/src/kaze/KAZEFeatures.h
similarity index 100%
rename from modules/features2d/src/kaze/KAZE.h
rename to modules/features2d/src/kaze/KAZEFeatures.h