cmake: Do not use deprecated feature

[hercules2020/kcf.git] / src / fft.cpp

diff --git a/src/fft.cpp b/src/fft.cpp
index 0fe5a9e993d31bf5312b0c82aaec002af7f8e80e..412618d070b864f72c8d4dee6e30ff2421aaefab 100644 (file)
--- a/src/fft.cpp
+++ b/src/fft.cpp
@@ -1,6 +1,7 @@
 
 #include "fft.h"
 #include <cassert>
+#include "debug.h"
 
 Fft::~Fft()
 {
@@ -29,11 +30,21 @@ void Fft::set_window(const MatDynMem &window)
 
 void Fft::forward(const MatScales &real_input, ComplexMat &complex_result)
 {
+    TRACE("");
+    DEBUG_PRINT(real_input);
     assert(real_input.dims == 3);
-    assert(real_input.size[0] == IF_BIG_BATCH(int(m_num_of_scales), 1));
+#ifdef BIG_BATCH
+    assert(real_input.size[0] == 1 || real_input.size[0] == int(m_num_of_scales));
+#else
+    assert(real_input.size[0] == 1);
+#endif
     assert(real_input.size[1] == int(m_height));
     assert(real_input.size[2] == int(m_width));
 
+    assert(complex_result.cols = freq_size(cv::Size(m_width, m_height)).width);
+    assert(complex_result.rows = freq_size(cv::Size(m_width, m_height)).height);
+    assert(complex_result.channels() == uint(real_input.size[0]));
+
     (void)real_input;
     (void)complex_result;
 }
@@ -41,7 +52,11 @@ void Fft::forward(const MatScales &real_input, ComplexMat &complex_result)
 void Fft::forward_window(MatScaleFeats &patch_feats, ComplexMat &complex_result, MatScaleFeats &tmp)
 {
         assert(patch_feats.dims == 4);
-        assert(patch_feats.size[0] == IF_BIG_BATCH(int(m_num_of_scales), 1));
+#ifdef BIG_BATCH
+        assert(patch_feats.size[0] == 1 || patch_feats.size[0] ==  int(m_num_of_scales));
+#else
+        assert(patch_feats.size[0] == 1);
+#endif
         assert(patch_feats.size[1] == int(m_num_of_feats));
         assert(patch_feats.size[2] == int(m_height));
         assert(patch_feats.size[3] == int(m_width));
@@ -59,8 +74,14 @@ void Fft::forward_window(MatScaleFeats &patch_feats, ComplexMat &complex_result,
 
 void Fft::inverse(ComplexMat &complex_input, MatScales &real_result)
 {
+    TRACE("");
+    DEBUG_PRINT(complex_input);
     assert(real_result.dims == 3);
-    assert(real_result.size[0] == IF_BIG_BATCH(int(m_num_of_scales), 1));
+#ifdef BIG_BATCH
+        assert(real_result.size[0] == 1 || real_result.size[0] ==  int(m_num_of_scales));
+#else
+        assert(real_result.size[0] == 1);
+#endif
     assert(real_result.size[1] == int(m_height));
     assert(real_result.size[2] == int(m_width));