changeset 36:4010960c659e

* Merge with Chris' changes
author Carl Bussey <c.bussey@se10.qmul.ac.uk>
date Thu, 04 Sep 2014 14:33:36 +0100
parents c8dd1049b2d3 (diff) 2b2e707c8c20 (current diff)
children 44d8e5dc1902
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/FIRFilter.cpp	Thu Sep 04 10:40:51 2014 +0100
+++ b/FIRFilter.cpp	Thu Sep 04 14:33:36 2014 +0100
@@ -80,7 +80,7 @@
     //copy to output
     int offset = 0;
     int outputLength = m_lengthInput;
-    if (outputType == all) outputLength = (int)m_lengthFIRFFT;
+    if (outputType == all) outputLength = m_lengthInput+m_numberOfCoefficients-1;
     else if (outputType == middle) offset = floor(m_numberOfCoefficients/2.0f);
     else if (outputType != first) cerr << "FIRFilter::process(params) - " << outputType << " is not a valid argument. outputType is set to first." << endl;