Commit 56622943 authored by Ievgen Khvedchenia's avatar Ievgen Khvedchenia

Rename KAZE to KAZEFeatures to fix MSVS x64 compiler error (Duplicate file name confused it)

parent 599bcfb5
...@@ -49,7 +49,7 @@ http://www.robesafe.com/personal/pablo.alcantarilla/papers/Alcantarilla13bmvc.pd ...@@ -49,7 +49,7 @@ http://www.robesafe.com/personal/pablo.alcantarilla/papers/Alcantarilla13bmvc.pd
*/ */
#include "precomp.hpp" #include "precomp.hpp"
#include "akaze/AKAZE.h" #include "akaze/AKAZEFeatures.h"
namespace cv namespace cv
{ {
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* @author Pablo F. Alcantarilla, Jesus Nuevo * @author Pablo F. Alcantarilla, Jesus Nuevo
*/ */
#include "AKAZE.h" #include "AKAZEFeatures.h"
#include "fed.h" #include "fed.h"
#include "nldiffusion_functions.h" #include "nldiffusion_functions.h"
......
...@@ -48,7 +48,7 @@ http://www.robesafe.com/personal/pablo.alcantarilla/papers/Alcantarilla12eccv.pd ...@@ -48,7 +48,7 @@ http://www.robesafe.com/personal/pablo.alcantarilla/papers/Alcantarilla12eccv.pd
*/ */
#include "precomp.hpp" #include "precomp.hpp"
#include "kaze/KAZE.h" #include "kaze/KAZEFeatures.h"
namespace cv namespace cv
{ {
......
...@@ -14,14 +14,14 @@ ...@@ -14,14 +14,14 @@
//============================================================================= //=============================================================================
/** /**
* @file KAZE.cpp * @file KAZEFeatures.cpp
* @brief Main class for detecting and describing features in a nonlinear * @brief Main class for detecting and describing features in a nonlinear
* scale space * scale space
* @date Jan 21, 2012 * @date Jan 21, 2012
* @author Pablo F. Alcantarilla * @author Pablo F. Alcantarilla
*/ */
#include "KAZE.h" #include "KAZEFeatures.h"
// Namespaces // Namespaces
using namespace std; using namespace std;
...@@ -381,20 +381,20 @@ void KAZEFeatures::Determinant_Hessian_Parallel(std::vector<cv::KeyPoint>& kpts) ...@@ -381,20 +381,20 @@ void KAZEFeatures::Determinant_Hessian_Parallel(std::vector<cv::KeyPoint>& kpts)
#ifdef _OPENMP #ifdef _OPENMP
#pragma omp parallel for #pragma omp parallel for
#endif #endif
for (int i = 1; i < evolution_.size() - 1; i++) { for (int i = 1; i < (int)evolution_.size() - 1; i++) {
Find_Extremum_Threading(i); Find_Extremum_Threading(i);
} }
// Now fill the vector of keypoints!!! // Now fill the vector of keypoints!!!
for (int i = 0; i < kpts_par_.size(); i++) { for (int i = 0; i < (int)kpts_par_.size(); i++) {
for (int j = 0; j < kpts_par_[i].size(); j++) { for (int j = 0; j < (int)kpts_par_[i].size(); j++) {
level = i + 1; level = i + 1;
is_extremum = true; is_extremum = true;
is_repeated = false; is_repeated = false;
is_out = false; is_out = false;
// Check in case we have the same point as maxima in previous evolution levels // 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) { 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); 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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment