Corrected small mistake with inverse raw in cufft.

diff --git a/src/fft_cufft.cpp b/src/fft_cufft.cpp
index 73733a5ce7ab594d66fc73f15607b6ed93f63675..001bffc3017e72e759299425efa6f75d00e32547 100644 (file)
--- a/src/fft_cufft.cpp
+++ b/src/fft_cufft.cpp
@@ -200,10 +200,10 @@ ComplexMat cuFFT::forward_window(const std::vector<cv::Mat> &input)
     return result;
 }
 
-cv::Mat cuFFT::inverse(const ComplexMat &inputf)
+cv::Mat cuFFT::inverse(const ComplexMat &input)
 {
-    int n_channels = inputf.n_channels;
-    cufftComplex *in = reinterpret_cast<cufftComplex*>(inputf.get_p_data());
+    int n_channels = input.n_channels;
+    cufftComplex *in = reinterpret_cast<cufftComplex*>(input.get_p_data());
     
     if(n_channels == 1){
         cv::Mat real_result(m_height, m_width, CV_32FC1, data_i_1ch);
@@ -238,8 +238,8 @@ cv::Mat cuFFT::inverse(const ComplexMat &inputf)
 
 float* cuFFT::inverse_raw(const ComplexMat &input)
 {
-    cv::Mat real_result(m_height, m_width, CV_32FC(n_channels), data_i_features_all_scales);
-
+    cufftComplex *in = reinterpret_cast<cufftComplex*>(input.get_p_data());
+    
     CufftErrorCheck(cufftExecC2R(plan_i_features_all_scales, in, reinterpret_cast<cufftReal*>(data_i_features_all_scales_d)));
 
     return data_i_features_all_scales;

diff --git a/src/fft_cufft.h b/src/fft_cufft.h
index 7a4848edf72c97008c5401a79302b1c08f5d1880..96b977b6f3cf7baedee48376d4a665558ef6bd46 100644 (file)
--- a/src/fft_cufft.h
+++ b/src/fft_cufft.h
@@ -23,7 +23,7 @@ public:
     void set_window(const cv::Mat &window) override;
     ComplexMat forward(const cv::Mat &input) override;
     ComplexMat forward_window(const std::vector<cv::Mat> &input) override;
-    cv::Mat inverse(const ComplexMat &inputf) override;
+    cv::Mat inverse(const ComplexMat &input) override;
     float* inverse_raw(const ComplexMat &input) override;
     ~cuFFT() override;
 private:

diff --git a/src/fft_fftw.cpp b/src/fft_fftw.cpp
index c09aa19ea747369496249267c852c65708b77da0..d59f09c4f1b871ff290835cfcbdbcfd53a7081da 100644 (file)
--- a/src/fft_fftw.cpp
+++ b/src/fft_fftw.cpp
@@ -230,11 +230,11 @@ ComplexMat Fftw::forward_window(const std::vector<cv::Mat> &input)
     return result;
 }
 
-cv::Mat Fftw::inverse(const ComplexMat &inputf)
+cv::Mat Fftw::inverse(const ComplexMat &input)
 {
-    int n_channels = inputf.n_channels;
+    int n_channels = input.n_channels;
     cv::Mat real_result(m_height, m_width, CV_32FC(n_channels));
-    fftwf_complex *in = reinterpret_cast<fftwf_complex*>(inputf.get_p_data());
+    fftwf_complex *in = reinterpret_cast<fftwf_complex*>(input.get_p_data());
     float *out = reinterpret_cast<float*>(real_result.data);
 
     if(n_channels == 1)

diff --git a/src/fft_opencv.cpp b/src/fft_opencv.cpp
index bd47836ea297b5bdabe164a0ca770220471c254a..043c186be09bb5f3d80814b2ee10bd656da6e4b1 100644 (file)
--- a/src/fft_opencv.cpp
+++ b/src/fft_opencv.cpp
@@ -35,15 +35,15 @@ ComplexMat FftOpencv::forward_window(const std::vector<cv::Mat> &input)
     return result;
 }
 
-cv::Mat FftOpencv::inverse(const ComplexMat &inputf)
+cv::Mat FftOpencv::inverse(const ComplexMat &input)
 {
     cv::Mat real_result;
-    if (inputf.n_channels == 1) {
-        cv::dft(inputf.to_cv_mat(), real_result, cv::DFT_INVERSE | cv::DFT_REAL_OUTPUT | cv::DFT_SCALE);
+    if (input.n_channels == 1) {
+        cv::dft(input.to_cv_mat(), real_result, cv::DFT_INVERSE | cv::DFT_REAL_OUTPUT | cv::DFT_SCALE);
     } else {
-        std::vector<cv::Mat> mat_channels = inputf.to_cv_mat_vector();
-        std::vector<cv::Mat> ifft_mats(inputf.n_channels);
-        for (int i = 0; i < inputf.n_channels; ++i) {
+        std::vector<cv::Mat> mat_channels = input.to_cv_mat_vector();
+        std::vector<cv::Mat> ifft_mats(input.n_channels);
+        for (int i = 0; i < input.n_channels; ++i) {
             cv::dft(mat_channels[i], ifft_mats[i], cv::DFT_INVERSE | cv::DFT_REAL_OUTPUT | cv::DFT_SCALE);
         }
         cv::merge(ifft_mats, real_result);

diff --git a/src/fft_opencv.h b/src/fft_opencv.h
index c455495347876654422cf6ad12847abba511e9d3..9497a1ea86dc6f6274e526f1bf1b21da5cbc51fe 100644 (file)
--- a/src/fft_opencv.h
+++ b/src/fft_opencv.h
@@ -11,7 +11,7 @@ public:
     void set_window(const cv::Mat &window) override;
     ComplexMat forward(const cv::Mat &input) override;
     ComplexMat forward_window(const std::vector<cv::Mat> &input) override;
-    cv::Mat inverse(const ComplexMat &inputf) override;
+    cv::Mat inverse(const ComplexMat &input) override;
     float* inverse_raw(const ComplexMat &input) override;
     ~FftOpencv() override;
 private: