VE7UWU
/
sdrangel
mirror of https://github.com/f4exb/sdrangel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Attempt to fix MSVC issue C2491 with decimators FI and FF

This commit is contained in:
f4exb 2020-06-23 11:01:16 +02:00
parent cbb1f9b685
commit 5e10105dac
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sdrbase/dsp/decimatorsff.h
View File

@ -25,15 +25,15 @@
/** Decimators with float input and float output */ /** Decimators with float input and float output */
template<bool IQOrder> template<bool IQOrder>
class SDRBASE_API DecimatorsFF class DecimatorsFF
{ {
public: public:
void decimate1(FSampleVector::iterator* it, const float* buf, qint32 nbIAndQ); SDRBASE_API void decimate1(FSampleVector::iterator* it, const float* buf, qint32 nbIAndQ);
void decimate2_inf(FSampleVector::iterator* it, const float* buf, qint32 nbIAndQ); SDRBASE_API void decimate2_inf(FSampleVector::iterator* it, const float* buf, qint32 nbIAndQ);
void decimate2_sup(FSampleVector::iterator* it, const float* buf, qint32 nbIAndQ); SDRBASE_API void decimate2_sup(FSampleVector::iterator* it, const float* buf, qint32 nbIAndQ);
void decimate2_cen(FSampleVector::iterator* it, const float* buf, qint32 nbIAndQ); void decimate2_cen(FSampleVector::iterator* it, const float* buf, qint32 nbIAndQ);
void decimate4_inf(FSampleVector::iterator* it, const float* buf, qint32 nbIAndQ); SDRBASE_API void decimate4_inf(FSampleVector::iterator* it, const float* buf, qint32 nbIAndQ);
void decimate4_sup(FSampleVector::iterator* it, const float* buf, qint32 nbIAndQ); SDRBASE_API void decimate4_sup(FSampleVector::iterator* it, const float* buf, qint32 nbIAndQ);
void decimate4_cen(FSampleVector::iterator* it, const float* buf, qint32 nbIAndQ); void decimate4_cen(FSampleVector::iterator* it, const float* buf, qint32 nbIAndQ);
void decimate8_inf(FSampleVector::iterator* it, const float* buf, qint32 nbIAndQ); void decimate8_inf(FSampleVector::iterator* it, const float* buf, qint32 nbIAndQ);
void decimate8_sup(FSampleVector::iterator* it, const float* buf, qint32 nbIAndQ); void decimate8_sup(FSampleVector::iterator* it, const float* buf, qint32 nbIAndQ);
@ -57,6 +57,7 @@ public:
IntHalfbandFilterEOF<DECIMATORSFF_HB_FILTER_ORDER, true> m_decimator64; // 6th stages IntHalfbandFilterEOF<DECIMATORSFF_HB_FILTER_ORDER, true> m_decimator64; // 6th stages
}; };
template<bool IQOrder> template<bool IQOrder>
void DecimatorsFF<IQOrder>::decimate2_cen(FSampleVector::iterator* it, const float* buf, qint32 nbIAndQ) void DecimatorsFF<IQOrder>::decimate2_cen(FSampleVector::iterator* it, const float* buf, qint32 nbIAndQ)
{ {

13
sdrbase/dsp/decimatorsfi.h
View File

@ -25,15 +25,15 @@
/** Decimators with float input and integer output */ /** Decimators with float input and integer output */
template<bool IQOrder> template<bool IQOrder>
class SDRBASE_API DecimatorsFI class DecimatorsFI
{ {
public: public:
void decimate1(SampleVector::iterator* it, const float* buf, qint32 nbIAndQ); SDRBASE_API void decimate1(SampleVector::iterator* it, const float* buf, qint32 nbIAndQ);
void decimate2_inf(SampleVector::iterator* it, const float* buf, qint32 nbIAndQ); SDRBASE_API void decimate2_inf(SampleVector::iterator* it, const float* buf, qint32 nbIAndQ);
void decimate2_sup(SampleVector::iterator* it, const float* buf, qint32 nbIAndQ); SDRBASE_API void decimate2_sup(SampleVector::iterator* it, const float* buf, qint32 nbIAndQ);
void decimate2_cen(SampleVector::iterator* it, const float* buf, qint32 nbIAndQ); void decimate2_cen(SampleVector::iterator* it, const float* buf, qint32 nbIAndQ);
void decimate4_inf(SampleVector::iterator* it, const float* buf, qint32 nbIAndQ); SDRBASE_API void decimate4_inf(SampleVector::iterator* it, const float* buf, qint32 nbIAndQ);
void decimate4_sup(SampleVector::iterator* it, const float* buf, qint32 nbIAndQ); SDRBASE_API void decimate4_sup(SampleVector::iterator* it, const float* buf, qint32 nbIAndQ);
void decimate4_cen(SampleVector::iterator* it, const float* buf, qint32 nbIAndQ); void decimate4_cen(SampleVector::iterator* it, const float* buf, qint32 nbIAndQ);
void decimate8_inf(SampleVector::iterator* it, const float* buf, qint32 nbIAndQ); void decimate8_inf(SampleVector::iterator* it, const float* buf, qint32 nbIAndQ);
void decimate8_sup(SampleVector::iterator* it, const float* buf, qint32 nbIAndQ); void decimate8_sup(SampleVector::iterator* it, const float* buf, qint32 nbIAndQ);
@ -57,6 +57,7 @@ public:
IntHalfbandFilterEOF<DECIMATORSFI_HB_FILTER_ORDER, true> m_decimator64; // 6th stages IntHalfbandFilterEOF<DECIMATORSFI_HB_FILTER_ORDER, true> m_decimator64; // 6th stages
}; };
template<bool IQOrder> template<bool IQOrder>
void DecimatorsFI<IQOrder>::decimate2_cen(SampleVector::iterator* it, const float* buf, qint32 nbIAndQ) void DecimatorsFI<IQOrder>::decimate2_cen(SampleVector::iterator* it, const float* buf, qint32 nbIAndQ)
{ {