diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2015-10-28 20:47:14 +0100 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2015-10-28 20:47:14 +0100 |
| commit | 393b1462d0ef51acf50abf570b487b46802d093e (patch) | |
| tree | 046a8ee1100dbff603b6cc996e083408b17663eb | |
| parent | 2f7afa510fbdd29ee8874db970d47646d4c88da2 (diff) | |
| download | dabmod-393b1462d0ef51acf50abf570b487b46802d093e.tar.gz dabmod-393b1462d0ef51acf50abf570b487b46802d093e.tar.bz2 dabmod-393b1462d0ef51acf50abf570b487b46802d093e.zip | |
Fix compilation in KISS FFT with SIMD due to std::complex
| -rw-r--r-- | src/OfdmGenerator.cpp | 4 | ||||
| -rw-r--r-- | src/Resampler.cpp | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/OfdmGenerator.cpp b/src/OfdmGenerator.cpp index 7044249..3dc85a9 100644 --- a/src/OfdmGenerator.cpp +++ b/src/OfdmGenerator.cpp @@ -238,8 +238,7 @@ int OfdmGenerator::process(Buffer* const dataIn, Buffer* dataOut) for (int k = 0; k < 4; ++k) { if (j < sizeOut) { for (size_t l = 0; l < mySpacing; ++l) { - cplxOut[j + l].real() = dataBuffer[l].r[k]; - cplxOut[j + l].imag() = dataBuffer[l].i[k]; + cplxOut[j + l] = complexf(dataBuffer[l].r[k], dataBuffer[l].i[k]); } j += mySpacing; } @@ -259,6 +258,7 @@ int OfdmGenerator::process(Buffer* const dataIn, Buffer* dataOut) in += myNbCarriers; out += mySpacing; + } # endif #endif diff --git a/src/Resampler.cpp b/src/Resampler.cpp index cda4ff4..4ad6638 100644 --- a/src/Resampler.cpp +++ b/src/Resampler.cpp @@ -275,10 +275,10 @@ int Resampler::process(Buffer* const dataIn, Buffer* dataOut) for (size_t k = 0; k < 4; ++k) { if (j < sizeOut) { for (size_t l = 0; l < myFftSizeOut / 2; ++l) { - cplxOut[j + l].real() = myBufferOut[l].real() + fftDataOut[l].r[k]; - cplxOut[j + l].imag() = myBufferOut[l].imag() + fftDataOut[l].i[k]; - myBufferOut[l].real() = fftDataOut[myFftSizeOut / 2 + l].r[k]; - myBufferOut[l].imag() = fftDataOut[myFftSizeOut / 2 + l].i[k]; + cplxOut[j + l] = complexf(myBufferOut[l].real() + fftDataOut[l].r[k], + myBufferOut[l].imag() + fftDataOut[l].i[k]); + myBufferOut[l] = complexf(fftDataOut[myFftSizeOut / 2 + l].r[k], + fftDataOut[myFftSizeOut / 2 + l].i[k]); } } j += myFftSizeOut / 2; |