diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2017-07-20 10:55:00 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2017-07-20 10:55:00 -0700 |
| commit | 2f3886e585c9c17a2fe9745d58046e9c8947d744 (patch) | |
| tree | 77cc6c36718bdce4669e4b034e654aa1bb5fa709 | |
| parent | 3a3210ec6e3c7c784dc7a31f87154f53ee036189 (diff) | |
| parent | e0dbca84b4ebe42d32267e68d6af75830377f4c7 (diff) | |
Merge remote-tracking branch 'github/pr/1389'
| -rw-r--r-- | gr-digital/lib/interpolating_resampler.cc | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/gr-digital/lib/interpolating_resampler.cc b/gr-digital/lib/interpolating_resampler.cc index 3ec27b05de..7cda29d073 100644 --- a/gr-digital/lib/interpolating_resampler.cc +++ b/gr-digital/lib/interpolating_resampler.cc @@ -291,11 +291,8 @@ namespace gr { // N.B. We create an extra final row for an offset of 1.0, because it's // easier than dealing with wrap around from 0.99... to 0.0 shifted // by 1 tap. - d_filters = std::vector<filter::kernel::fir_filter_ccf*>(d_nfilters + 1, - NULL); - d_diff_filters = std::vector<filter::kernel::fir_filter_ccf*>( - d_nfilters + 1, - NULL); + d_filters = std::vector<filter::kernel::fir_filter_ccf*>(d_nfilters + 1); + d_diff_filters = std::vector<filter::kernel::fir_filter_ccf*>(d_nfilters + 1); std::vector<float> t(NTAPS, 0); int incr = NSTEPS/d_nfilters; @@ -388,11 +385,8 @@ namespace gr { // N.B. We create an extra final row for an offset of 1.0, because it's // easier than dealing with wrap around from 0.99... to 0.0 shifted // by 1 tap. - d_filters = std::vector<filter::kernel::fir_filter_fff*>(d_nfilters + 1, - NULL); - d_diff_filters = std::vector<filter::kernel::fir_filter_fff*>( - d_nfilters + 1, - NULL); + d_filters = std::vector<filter::kernel::fir_filter_fff*>(d_nfilters + 1); + d_diff_filters = std::vector<filter::kernel::fir_filter_fff*>(d_nfilters + 1); std::vector<float> t(NTAPS, 0); int incr = NSTEPS/d_nfilters; @@ -541,11 +535,8 @@ namespace gr { // N.B. We create an extra final row for an offset of 1.0, because it's // easier than dealing with wrap around from 0.99... to 0.0 shifted // by 1 tap. - d_filters = std::vector<filter::kernel::fir_filter_ccf*>(d_nfilters + 1, - NULL); - d_diff_filters = std::vector<filter::kernel::fir_filter_ccf*>( - d_nfilters + 1, - NULL); + d_filters = std::vector<filter::kernel::fir_filter_ccf*>(d_nfilters + 1); + d_diff_filters = std::vector<filter::kernel::fir_filter_ccf*>(d_nfilters + 1); m = taps.size(); n = diff_taps.size(); @@ -709,11 +700,8 @@ namespace gr { // N.B. We create an extra final row for an offset of 1.0, because it's // easier than dealing with wrap around from 0.99... to 0.0 shifted // by 1 tap. - d_filters = std::vector<filter::kernel::fir_filter_fff*>(d_nfilters + 1, - NULL); - d_diff_filters = std::vector<filter::kernel::fir_filter_fff*>( - d_nfilters + 1, - NULL); + d_filters = std::vector<filter::kernel::fir_filter_fff*>(d_nfilters + 1); + d_diff_filters = std::vector<filter::kernel::fir_filter_fff*>(d_nfilters + 1); m = taps.size(); n = diff_taps.size(); |