comparison segmentino/Segmentino.cpp @ 76:a595de3e6f8d

Fix invalid call to parts.erase(parts.end()), which can crash and never does anything good. I think this is the intended behaviour.

 
 
 // Merge Nulls
 void mergenulls(vector<Part> &parts)
 {
+/*
+    cerr << "Segmentino: mergenulls: before: "<< endl;
+    for (int iPart=0; iPart<(int)parts.size(); ++iPart) {
+        cerr << parts[iPart].letter << ": ";
+        for (int iIndex=0; iIndex<(int)parts[iPart].indices.size(); ++iIndex) {
+            cerr << parts[iPart].indices[iIndex];
+            if (iIndex+1 < (int)parts[iPart].indices.size()) {
+                cerr << ", ";
+            }
+        }
+        cerr << endl;
+    }
+*/
     for (int iPart=0; iPart<(int)parts.size(); ++iPart)
     {
         
         vector<Part> newVectorPart;
         

                 else
                 {
                     newVectorPart[newpartind].n = newVectorPart[newpartind].n+1;
                 }
             }
-            parts.erase (parts.end());
+            parts.erase (parts.begin() + iPart);
             
             for (int i=0; i<(int)newVectorPart.size(); ++i)
                 parts.push_back(newVectorPart[i]);
-        }
-    }
+
+            break;
+        }
+    }
+/*
+    cerr << "Segmentino: mergenulls: after: "<< endl;
+    for (int iPart=0; iPart<(int)parts.size(); ++iPart) {
+        cerr << parts[iPart].letter << ": ";
+        for (int iIndex=0; iIndex<(int)parts[iPart].indices.size(); ++iIndex) {
+            cerr << parts[iPart].indices[iIndex];
+            if (iIndex+1 < (int)parts[iPart].indices.size()) {
+                cerr << ", ";
+            }
+        }
+        cerr << endl;
+    }
+*/
 }
 
 /* ------ Segmentation ------ */
 
 vector<Part> songSegment(Vamp::Plugin::FeatureList quantisedChromagram)