Mercurial > hg > nnls-chroma

changeset 146:2cd99c0810f2 mirex2013

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix compiler warnings
author Chris Cannam
date Thu, 13 Jun 2013 10:22:53 +0100
parents 296ffb24571f
children 5a7f78c34133 d0ea842539a9 40f8cfed5b5a
files chromamethods.cpp
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/chromamethods.cpp	Sun Apr 14 19:13:28 2013 +0100
+++ b/chromamethods.cpp	Thu Jun 13 10:22:53 2013 +0100
@@ -142,7 +142,7 @@
         // cerr << cosp << endl;
     }
 
-    for (int i = 0; i < nFFT * cq_f.size(); ++i) {
+    for (int i = 0; i < nFFT * (int)cq_f.size(); ++i) {
         outmatrix[i] = 0.f;
     }
 	
@@ -183,14 +183,14 @@
     }
     cq_f.push_back(440 * pow(2.0,0.083333 * (maxMIDI-69)));
 
-    float curr_f;
+//    float curr_f;
     float floatbin;
     float curr_amp;
     // now for every combination calculate the matrix element
     for (int iOut = 0; iOut < 12 * (maxoctave - minoctave); ++iOut) {
         // cerr << iOut << endl;
         for (int iHarm = 1; iHarm <= 20; ++iHarm) {
-            curr_f = 440 * pow(2,(minMIDI-69+iOut)*1.0/12) * iHarm;
+//            curr_f = 440 * pow(2,(minMIDI-69+iOut)*1.0/12) * iHarm;
             // if (curr_f > cq_f[nNote-1])  break;
             floatbin = ((iOut + 1) * binspersemitone + 1) + binspersemitone * 12 * log2(iHarm);
             // cerr << floatbin << endl;