From 734e976e67384f4ba07f3349234c71e3655bd9f9 Mon Sep 17 00:00:00 2001 From: f4exb Date: Tue, 13 Nov 2018 10:52:41 +0100 Subject: [PATCH] Windows: MSVC2017: remove export from templated class IntHalfbandFilterEO --- sdrbase/dsp/inthalfbandfiltereo.h | 53 ++++++++++++++++++++----------- 1 file changed, 34 insertions(+), 19 deletions(-) diff --git a/sdrbase/dsp/inthalfbandfiltereo.h b/sdrbase/dsp/inthalfbandfiltereo.h index a5cff5344..fb598521e 100644 --- a/sdrbase/dsp/inthalfbandfiltereo.h +++ b/sdrbase/dsp/inthalfbandfiltereo.h @@ -26,12 +26,27 @@ #include #include "dsp/dsptypes.h" #include "dsp/hbfiltertraits.h" -#include "export.h" template -class SDRBASE_API IntHalfbandFilterEO { +class IntHalfbandFilterEO { public: - IntHalfbandFilterEO(); + IntHalfbandFilterEO() + { + m_size = HBFIRFilterTraits::hbOrder/2; + + for (int i = 0; i < 2*m_size; i++) + { + m_even[0][i] = 0; + m_even[1][i] = 0; + m_odd[0][i] = 0; + m_odd[1][i] = 0; + m_samples[i][0] = 0; + m_samples[i][1] = 0; + } + + m_ptr = 0; + m_state = 0; + } // downsample by 2, return center part of original spectrum bool workDecimateCenter(Sample* sample) @@ -912,23 +927,23 @@ protected: } }; -template -IntHalfbandFilterEO::IntHalfbandFilterEO() -{ - m_size = HBFIRFilterTraits::hbOrder/2; +//template +//IntHalfbandFilterEO::IntHalfbandFilterEO() +//{ +// m_size = HBFIRFilterTraits::hbOrder/2; - for (int i = 0; i < 2*m_size; i++) - { - m_even[0][i] = 0; - m_even[1][i] = 0; - m_odd[0][i] = 0; - m_odd[1][i] = 0; - m_samples[i][0] = 0; - m_samples[i][1] = 0; - } +// for (int i = 0; i < 2*m_size; i++) +// { +// m_even[0][i] = 0; +// m_even[1][i] = 0; +// m_odd[0][i] = 0; +// m_odd[1][i] = 0; +// m_samples[i][0] = 0; +// m_samples[i][1] = 0; +// } - m_ptr = 0; - m_state = 0; -} +// m_ptr = 0; +// m_state = 0; +//} #endif /* SDRBASE_DSP_INTHALFBANDFILTEREO_H_ */