# HG changeset patch
# User Chris Cannam
# Date 1417798026 0
# Node ID af19bee9e53bfc538b4231612247f7e635941ec0
# Parent  f5f3b50b2b9f7142c7d29b99a67ab3f48038546e# Parent  04a3c152e59070491adee566234229bfdcf02b32
Merge from default branch

diff -r f5f3b50b2b9f -r af19bee9e53b src/Silvet.cpp
--- a/src/Silvet.cpp	Fri Dec 05 16:40:51 2014 +0000
+++ b/src/Silvet.cpp	Fri Dec 05 16:47:06 2014 +0000
@@ -613,8 +613,8 @@
             vector<vector<int> >(width, vector<int>(pack.templateNoteCount, 0));
     }
 
-    vector<bool> present(width, false);
-
+    double columnThreshold = 1e-5;
+    
 #pragma omp parallel for
     for (int i = 0; i < width; ++i) {
 
@@ -622,9 +622,7 @@
         for (int j = 0; j < pack.templateHeight; ++j) {
             sum += filtered.at(i).at(j);
         }
-        if (sum < 1e-5) continue;
-
-        present[i] = true;
+        if (sum < columnThreshold) continue;
 
         EM em(&pack, m_mode == HighQualityMode);
 
@@ -659,18 +657,6 @@
         
     for (int i = 0; i < width; ++i) {
 
-        if (!present[i]) {
-            // silent column
-            for (int j = 0; j < pack.templateNoteCount; ++j) {
-                m_postFilter[j]->push(0.0);
-            }
-            m_pianoRoll.push_back(map<int, double>());
-            if (wantShifts) {
-                m_pianoRollShifts.push_back(map<int, int>());
-            }
-            continue;
-        }
-
         vector<double> filtered = postProcess
             (localPitches[i], localBestShifts[i], wantShifts);