diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2012-08-30 20:43:41 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2012-08-30 20:43:41 -0400 |
| commit | 853920e9aaa32f9f0dda2cdc75ded4eee738117f (patch) | |
| tree | 8d84b0e436e10b2c86a8c17b6bce360eadad6f45 /gr-filter | |
| parent | ef6648763589d389c0e95d62f524e46b32dd597c (diff) | |
filter: fixes naligned value when volk alignment is 1.
Diffstat (limited to 'gr-filter')
| -rw-r--r-- | gr-filter/lib/fir_filter.cc | 12 | ||||
| -rw-r--r-- | gr-filter/lib/fir_filter_with_buffer.cc | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/gr-filter/lib/fir_filter.cc b/gr-filter/lib/fir_filter.cc index 2334058241..6137dd2693 100644 --- a/gr-filter/lib/fir_filter.cc +++ b/gr-filter/lib/fir_filter.cc @@ -34,7 +34,7 @@ namespace gr { const std::vector<float> &taps) { d_align = volk_get_alignment(); - d_naligned = d_align / sizeof(float); + d_naligned = std::max((size_t)1, d_align / sizeof(float)); d_aligned_taps = NULL; set_taps(taps); @@ -139,7 +139,7 @@ namespace gr { const std::vector<float> &taps) { d_align = volk_get_alignment(); - d_naligned = d_align / sizeof(gr_complex); + d_naligned = std::max((size_t)1, d_align / sizeof(gr_complex)); d_aligned_taps = NULL; set_taps(taps); @@ -246,7 +246,7 @@ namespace gr { const std::vector<gr_complex> &taps) { d_align = volk_get_alignment(); - d_naligned = d_align / sizeof(float); + d_naligned = std::max((size_t)1, d_align / sizeof(float)); d_aligned_taps = NULL; set_taps(taps); @@ -352,7 +352,7 @@ namespace gr { const std::vector<gr_complex> &taps) { d_align = volk_get_alignment(); - d_naligned = d_align / sizeof(gr_complex); + d_naligned = std::max((size_t)1, d_align / sizeof(gr_complex)); d_aligned_taps = NULL; set_taps(taps); @@ -457,7 +457,7 @@ namespace gr { const std::vector<gr_complex> &taps) { d_align = volk_get_alignment(); - d_naligned = d_align / sizeof(short); + d_naligned = std::max((size_t)1, d_align / sizeof(short)); d_aligned_taps = NULL; set_taps(taps); @@ -563,7 +563,7 @@ namespace gr { const std::vector<float> &taps) { d_align = volk_get_alignment(); - d_naligned = d_align / sizeof(float); + d_naligned = std::max((size_t)1, d_align / sizeof(float)); d_aligned_taps = NULL; set_taps(taps); diff --git a/gr-filter/lib/fir_filter_with_buffer.cc b/gr-filter/lib/fir_filter_with_buffer.cc index 7a35a92252..7bff8d4a77 100644 --- a/gr-filter/lib/fir_filter_with_buffer.cc +++ b/gr-filter/lib/fir_filter_with_buffer.cc @@ -38,7 +38,7 @@ namespace gr { fir_filter_with_buffer_fff::fir_filter_with_buffer_fff(const std::vector<float> &taps) { d_align = volk_get_alignment(); - d_naligned = d_align / sizeof(float); + d_naligned = std::max((size_t)1, d_align / sizeof(float)); d_buffer_ptr = NULL; d_aligned_taps = NULL; @@ -191,7 +191,7 @@ namespace gr { fir_filter_with_buffer_ccc::fir_filter_with_buffer_ccc(const std::vector<gr_complex> &taps) { d_align = volk_get_alignment(); - d_naligned = d_align / sizeof(gr_complex); + d_naligned = std::max((size_t)1, d_align / sizeof(gr_complex)); d_buffer_ptr = NULL; d_aligned_taps = NULL; @@ -344,7 +344,7 @@ namespace gr { fir_filter_with_buffer_ccf::fir_filter_with_buffer_ccf(const std::vector<float> &taps) { d_align = volk_get_alignment(); - d_naligned = d_align / sizeof(gr_complex); + d_naligned = std::max((size_t)1, d_align / sizeof(gr_complex)); d_buffer_ptr = NULL; d_aligned_taps = NULL; |