# HG changeset patch
# User Chris Cannam
# Date 1415883424 0
# Node ID 15a7fdc02c58a3953cbaa280dcd601abe19bc507
# Parent  8cce4e13ede3260acceb285b4c112b860dd23683# Parent  2f8a802b62f913e71df306bc57756313d2723f41
Merge from default branch

diff -r 8cce4e13ede3 -r 15a7fdc02c58 src/FeatureExtractor.cpp
--- a/src/FeatureExtractor.cpp	Thu Nov 13 12:50:54 2014 +0000
+++ b/src/FeatureExtractor.cpp	Thu Nov 13 12:57:04 2014 +0000
@@ -76,12 +76,10 @@
     while (i <= m_params.fftSize/2) {
         double midi = log(i*binWidth/440.0) / log(2.0) * 12 + 69;
         if (midi > 127) midi = 127;
-        m_freqMap[i++] = crossoverBin + lrint(midi) - crossoverMidi;
+        int target = crossoverBin + lrint(midi) - crossoverMidi;
+        if (target >= m_featureSize) target = m_featureSize - 1;
+        m_freqMap[i++] = target;
     }
-
-    cerr << "rate = " << m_params.sampleRate << ", m_featureSize = " << m_featureSize << ", m_freqMap[" << i << "-1] = " << m_freqMap[i-1] << endl;
-
-    assert(m_featureSize == m_freqMap[i-1] + 1);
 }
 
 void
diff -r 8cce4e13ede3 -r 15a7fdc02c58 src/Matcher.cpp
--- a/src/Matcher.cpp	Thu Nov 13 12:50:54 2014 +0000
+++ b/src/Matcher.cpp	Thu Nov 13 12:57:04 2014 +0000
@@ -103,7 +103,6 @@
 Matcher::expand()
 {
     int distSize = (params.maxRunCount + 1) * blockSize;
-
     bestPathCost.resize(distXSize, vector<int>(distSize, 0));
     distance.resize(distXSize, vector<unsigned char>(distSize, 0));
     distYSizes.resize(blockSize, distSize);