# HG changeset patch
# User Carl Bussey <c.bussey@se10.qmul.ac.uk>
# Date 1409837616 -3600
# Node ID 4010960c659e9c6ef604fd836b31462dc68cbaee
# Parent  c8dd1049b2d37bcaa3da0bf291e3bb42ae5aa0db# Parent  2b2e707c8c20977f9b1b9d72a5bce0cfdde7c91f
* Merge with Chris' changes

diff -r 2b2e707c8c20 -r 4010960c659e FIRFilter.cpp
--- 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;