From 0085806bc8cf305a5cb3db63eda910475a77c310 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Tue, 25 Sep 2018 00:02:21 +0200 Subject: [PATCH] fftw: Make everything related to BIG_BATCH conditionally compilable --- src/fft_fftw.cpp | 13 +++++++------ src/fft_fftw.h | 6 ++++-- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/fft_fftw.cpp b/src/fft_fftw.cpp index a8dbe93..9f11163 100644 --- a/src/fft_fftw.cpp +++ b/src/fft_fftw.cpp @@ -107,9 +107,10 @@ void Fftw::forward_window(MatScaleFeats &feat, ComplexMat & complex_result, Mat if (n_scales == 1) fftwf_execute_dft_r2c(plan_fw, in, out); +#ifdef BIG_BATCH else fftwf_execute_dft_r2c(plan_fw_all_scales, in, out); - return; +#endif } void Fftw::inverse(ComplexMat &complex_input, MatScales &real_result) @@ -135,9 +136,9 @@ Fftw::~Fftw() fftwf_destroy_plan(plan_fw); fftwf_destroy_plan(plan_i_1ch); - if (BIG_BATCH_MODE) { - fftwf_destroy_plan(plan_f_all_scales); - fftwf_destroy_plan(plan_i_all_scales); - fftwf_destroy_plan(plan_fw_all_scales); - } +#ifdef BIG_BATCH + fftwf_destroy_plan(plan_f_all_scales); + fftwf_destroy_plan(plan_fw_all_scales); + fftwf_destroy_plan(plan_i_all_scales); +#endif } diff --git a/src/fft_fftw.h b/src/fft_fftw.h index eda615d..9c29e62 100644 --- a/src/fft_fftw.h +++ b/src/fft_fftw.h @@ -26,8 +26,10 @@ protected: private: cv::Mat m_window; - fftwf_plan plan_f, plan_f_all_scales, plan_fw, plan_fw_all_scales, plan_i_all_scales, - plan_i_1ch; + fftwf_plan plan_f, plan_fw, plan_i_1ch; +#ifdef BIG_BATCH + fftwf_plan plan_f_all_scales, plan_fw_all_scales, plan_i_all_scales; +#endif }; #endif // FFT_FFTW_H -- 2.39.2