From 5b1ffd434b41c738dd3e28b0512e705234bc8678 Mon Sep 17 00:00:00 2001 From: f4exb Date: Mon, 12 Oct 2015 03:46:45 +0200 Subject: [PATCH] Fixed inf and sup decimators by 32 and 64 --- CMakeLists.txt | 4 ++-- include/dsp/decimators.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 656d08a6d..edc9e2830 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,8 +33,8 @@ ENDIF() ############################################################################## #include(${QT_USE_FILE}) -set( QT_DEFINITIONS "${QT_DEFINITIONS} -DQT_NO_DEBUG_OUTPUT" ) -#set( QT_DEFINITIONS "${QT_DEFINITIONS}" ) +#set( QT_DEFINITIONS "${QT_DEFINITIONS} -DQT_NO_DEBUG_OUTPUT" ) +set( QT_DEFINITIONS "${QT_DEFINITIONS}" ) add_definitions(${QT_DEFINITIONS}) if(MSVC) diff --git a/include/dsp/decimators.h b/include/dsp/decimators.h index 8347f63ca..8650a009e 100644 --- a/include/dsp/decimators.h +++ b/include/dsp/decimators.h @@ -362,7 +362,7 @@ void Decimators::decimate32_inf(SampleVector::iterator* i m_decimator2.myDecimate(xreal[0], yimag[0], &xreal[1], &yimag[1]); m_decimator2.myDecimate(xreal[2], yimag[2], &xreal[3], &yimag[3]); - m_decimator2.myDecimate(xreal[4], yimag[4], &xreal[5], &yimag[3]); + m_decimator2.myDecimate(xreal[4], yimag[4], &xreal[5], &yimag[5]); m_decimator2.myDecimate(xreal[6], yimag[6], &xreal[7], &yimag[7]); m_decimator4.myDecimate(xreal[1], yimag[1], &xreal[3], &yimag[3]); @@ -393,7 +393,7 @@ void Decimators::decimate32_sup(SampleVector::iterator* i m_decimator2.myDecimate(xreal[0], yimag[0], &xreal[1], &yimag[1]); m_decimator2.myDecimate(xreal[2], yimag[2], &xreal[3], &yimag[3]); - m_decimator2.myDecimate(xreal[4], yimag[4], &xreal[5], &yimag[3]); + m_decimator2.myDecimate(xreal[4], yimag[4], &xreal[5], &yimag[5]); m_decimator2.myDecimate(xreal[6], yimag[6], &xreal[7], &yimag[7]); m_decimator4.myDecimate(xreal[1], yimag[1], &xreal[3], &yimag[3]); @@ -424,7 +424,7 @@ void Decimators::decimate64_inf(SampleVector::iterator* i m_decimator2.myDecimate(xreal[0], yimag[0], &xreal[1], &yimag[1]); m_decimator2.myDecimate(xreal[2], yimag[2], &xreal[3], &yimag[3]); - m_decimator2.myDecimate(xreal[4], yimag[4], &xreal[5], &yimag[3]); + m_decimator2.myDecimate(xreal[4], yimag[4], &xreal[5], &yimag[5]); m_decimator2.myDecimate(xreal[6], yimag[6], &xreal[7], &yimag[7]); m_decimator2.myDecimate(xreal[8], yimag[8], &xreal[9], &yimag[9]); m_decimator2.myDecimate(xreal[10], yimag[10], &xreal[11], &yimag[11]); @@ -464,7 +464,7 @@ void Decimators::decimate64_sup(SampleVector::iterator* i m_decimator2.myDecimate(xreal[0], yimag[0], &xreal[1], &yimag[1]); m_decimator2.myDecimate(xreal[2], yimag[2], &xreal[3], &yimag[3]); - m_decimator2.myDecimate(xreal[4], yimag[4], &xreal[5], &yimag[3]); + m_decimator2.myDecimate(xreal[4], yimag[4], &xreal[5], &yimag[5]); m_decimator2.myDecimate(xreal[6], yimag[6], &xreal[7], &yimag[7]); m_decimator2.myDecimate(xreal[8], yimag[8], &xreal[9], &yimag[9]); m_decimator2.myDecimate(xreal[10], yimag[10], &xreal[11], &yimag[11]);