Do not use virtual methods in FFT class

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

diff --git a/src/fft.cpp b/src/fft.cpp
index 27998861f5c51504c6b6999fd56867f707846ec9..e6be093194333041eb0778fb89c357ea2d7376c9 100644 (file)
--- a/src/fft.cpp
+++ b/src/fft.cpp
@@ -1,11 +1,7 @@
 
 #include "fft.h"
 #include <cassert>
-
-Fft::~Fft()
-{
-
-}
+#include "debug.h"
 
 void Fft::init(unsigned width, unsigned height, unsigned num_of_feats, unsigned num_of_scales)
 {
@@ -29,31 +25,33 @@ 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(int(complex_result.cols) == freq_size(cv::Size(m_width, m_height)).width);
+    assert(int(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;
 }
 
-void Fft::forward_window(MatFeats &patch_feats, ComplexMat &complex_result, MatFeats &tmp)
-{
-        assert(patch_feats.dims == 3);
-        assert(patch_feats.size[0] == int(m_num_of_feats));
-        assert(patch_feats.size[1] == int(m_height));
-        assert(patch_feats.size[2] == int(m_width));
-
-        (void)tmp;
-        (void)complex_result;
-        (void)patch_feats;
-}
-
 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));
@@ -64,18 +62,31 @@ void Fft::forward_window(MatScaleFeats &patch_feats, ComplexMat &complex_result,
         assert(tmp.size[2] == patch_feats.size[2]);
         assert(tmp.size[3] == patch_feats.size[3]);
 
+        assert(int(complex_result.cols) == freq_size(cv::Size(m_width, m_height)).width);
+        assert(int(complex_result.rows) == freq_size(cv::Size(m_width, m_height)).height);
+        assert(complex_result.channels() == uint(patch_feats.size[0] * patch_feats.size[1]));
+
         (void)patch_feats;
         (void)complex_result;
         (void)tmp;
 }
 
-void Fft::inverse(ComplexMat &complex_input, MatDynMem &real_result)
+void Fft::inverse(ComplexMat &complex_input, MatScales &real_result)
 {
-    assert(real_result.dims == 4);
-    assert(real_result.size[0] == IF_BIG_BATCH(int(m_num_of_scales), 1));
-    assert(real_result.size[1] == int(m_num_of_feats));
-    assert(real_result.size[2] == int(m_height));
-    assert(real_result.size[3] == int(m_width));
+    TRACE("");
+    DEBUG_PRINT(complex_input);
+    assert(real_result.dims == 3);
+#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));
+
+    assert(int(complex_input.cols) == freq_size(cv::Size(m_width, m_height)).width);
+    assert(int(complex_input.rows) == freq_size(cv::Size(m_width, m_height)).height);
+    assert(complex_input.channels() == uint(real_result.size[0]));
 
     (void)complex_input;
     (void)real_result;