VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-15 12:51:49 -05:00
Code Issues Projects Releases Wiki Activity

Fixed merge error

Browse Source
This commit is contained in:
f4exb 2020-03-16 21:45:53 +01:00
parent cee7bfdb1d
commit 38ef87c577
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sdrbase/dsp/fftwengine.cpp
View File

@ -4,12 +4,8 @@
FFTWEngine::FFTWEngine(const QString& fftWisdomFileName) : FFTWEngine::FFTWEngine(const QString& fftWisdomFileName) :
m_fftWisdomFileName(fftWisdomFileName), m_fftWisdomFileName(fftWisdomFileName),
m_plans(), m_plans(),
<<<<<<< ours
m_currentPlan(NULL)
=======
m_currentPlan(nullptr), m_currentPlan(nullptr),
m_reuse(true) m_reuse(true)
>>>>>>> theirs
{ {
} }
@ -20,14 +16,6 @@ FFTWEngine::~FFTWEngine()
void FFTWEngine::configure(int n, bool inverse) void FFTWEngine::configure(int n, bool inverse)
{ {
<<<<<<< ours
for(Plans::const_iterator it = m_plans.begin(); it != m_plans.end(); ++it) {
if(((*it)->n == n) && ((*it)->inverse == inverse)) {
m_currentPlan = *it;
return;
}
}
=======
if (m_reuse) if (m_reuse)
{ {
for (Plans::const_iterator it = m_plans.begin(); it != m_plans.end(); ++it) for (Plans::const_iterator it = m_plans.begin(); it != m_plans.end(); ++it)
@ -39,7 +27,6 @@ void FFTWEngine::configure(int n, bool inverse)
} }
} }
} }
>>>>>>> theirs
m_currentPlan = new Plan; m_currentPlan = new Plan;
m_currentPlan->n = n; m_currentPlan->n = n;