diff options
| author | Johnathan Corgan | 2010-08-02 17:03:39 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2010-08-02 17:03:39 -0700 |
| commit | 5198dfe1d9fae8a2b4fa180cdc868a3bfdded7f5 (patch) | |
| tree | 717ba71fa282cd4189380a7f2a885ec557541c50 /gnuradio-core/src/lib/general/gri_fft.cc | |
| parent | 02ad84daaff3976d74dd8501b007775b196f7fcd (diff) | |
| parent | 8034e2cd49fd71bfdf1ed587d49781a444e1cced (diff) | |
| download | gnuradio-5198dfe1d9fae8a2b4fa180cdc868a3bfdded7f5.tar.gz gnuradio-5198dfe1d9fae8a2b4fa180cdc868a3bfdded7f5.tar.bz2 gnuradio-5198dfe1d9fae8a2b4fa180cdc868a3bfdded7f5.zip | |
Merge branch 'master' into next
Diffstat (limited to 'gnuradio-core/src/lib/general/gri_fft.cc')
| -rw-r--r-- | gnuradio-core/src/lib/general/gri_fft.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/gnuradio-core/src/lib/general/gri_fft.cc b/gnuradio-core/src/lib/general/gri_fft.cc index 1ce14eefd..e535f28c7 100644 --- a/gnuradio-core/src/lib/general/gri_fft.cc +++ b/gnuradio-core/src/lib/general/gri_fft.cc @@ -28,7 +28,6 @@ #include <stdio.h> #include <cassert> #include <stdexcept> -#include <gr_prefs.h> boost::mutex & @@ -114,9 +113,7 @@ gri_fft_complex::gri_fft_complex (int fft_size, bool forward) reinterpret_cast<fftwf_complex *>(d_inbuf), reinterpret_cast<fftwf_complex *>(d_outbuf), forward ? FFTW_FORWARD : FFTW_BACKWARD, - gr_prefs::singleton()->get_bool("fftw", "estimate", false) == true ? FFTW_ESTIMATE - : FFTW_MEASURE); - + FFTW_MEASURE); if (d_plan == NULL) { fprintf(stderr, "gri_fft_complex: error creating plan\n"); @@ -168,8 +165,7 @@ gri_fft_real_fwd::gri_fft_real_fwd (int fft_size) d_plan = fftwf_plan_dft_r2c_1d (fft_size, d_inbuf, reinterpret_cast<fftwf_complex *>(d_outbuf), - gr_prefs::singleton()->get_bool("fftw", "estimate", false) == true ? FFTW_ESTIMATE - : FFTW_MEASURE); + FFTW_MEASURE); if (d_plan == NULL) { fprintf(stderr, "gri_fft_real_fwd: error creating plan\n"); |