Mercurial > hg > segmenter-vamp-plugin

changeset 43:bf13b49cd82f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author matthiasm
date Mon, 21 May 2012 13:10:08 +0100
parents 2f37db7cbf98
children 4fd0ce6f1f02
files songparts/SongParts.cpp
diffstat 1 files changed, 7 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/songparts/SongParts.cpp	Thu May 17 15:25:31 2012 +0100
+++ b/songparts/SongParts.cpp	Mon May 21 13:10:08 2012 +0100
@@ -1098,9 +1098,10 @@
     
     FeatureList fwQchromagram; // frame-wise beat-quantised chroma
     FeatureList bwQchromagram; // beat-wise beat-quantised chroma
-    
-    int nChromaFrame = (int) chromagram.size();
-    int nBeat = (int) beats.size();
+
+
+    size_t nChromaFrame = chromagram.size();
+    size_t nBeat = beats.size();
     
     if (nBeat == 0 && nChromaFrame == 0) return returnVector;
     
@@ -1112,7 +1113,7 @@
     int currBeatCount = -1; // start before first beat
     int framesInBeat = 0;
     
-    for (int iChroma = 0; iChroma < nChromaFrame; ++iChroma)
+    for (size_t iChroma = 0; iChroma < nChromaFrame; ++iChroma)
     {
         Vamp::RealTime frameTimestamp = chromagram[iChroma].timestamp;
         Vamp::RealTime newBeatTimestamp;
@@ -1163,6 +1164,8 @@
     return returnVector;
 }
 
+
+
 /* -------------------------------- */
 /* ------ Support Functions  ------ */
 /* -------------------------------- */