Mercurial > hg > qm-dsp

diff maths/MathUtilities.cpp @ 325:31f22daeba64

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix compiler warnings
author Chris Cannam <c.cannam@qmul.ac.uk>
date Thu, 13 Jun 2013 10:23:09 +0100
parents d5014ab8b0e5
children 50fae18236ee
line wrap: on
line diff
--- a/maths/MathUtilities.cpp	Tue Feb 12 17:46:47 2013 +0000
+++ b/maths/MathUtilities.cpp	Thu Jun 13 10:23:09 2013 +0100
@@ -155,7 +155,7 @@
 {
     double sum = 0.;
 	
-    for (int i = 0; i < count; ++i)
+    for (int i = 0; i < (int)count; ++i)
     {
         sum += src[start + i];
     }
@@ -167,7 +167,6 @@
 {
     unsigned int i;
     double temp = 0.0;
-    double a=0.0;
 
     if (len == 0) {
         *min = *max = 0;
@@ -317,9 +316,9 @@
     case NormaliseUnitSum:
     {
         double sum = 0.0;
-        for (int i = 0; i < data.size(); ++i) sum += data[i];
+        for (int i = 0; i < (int)data.size(); ++i) sum += data[i];
         if (sum != 0.0) {
-            for (int i = 0; i < data.size(); ++i) data[i] /= sum;
+            for (int i = 0; i < (int)data.size(); ++i) data[i] /= sum;
         }
     }
     break;
@@ -327,11 +326,11 @@
     case NormaliseUnitMax:
     {
         double max = 0.0;
-        for (int i = 0; i < data.size(); ++i) {
+        for (int i = 0; i < (int)data.size(); ++i) {
             if (fabs(data[i]) > max) max = fabs(data[i]);
         }
         if (max != 0.0) {
-            for (int i = 0; i < data.size(); ++i) data[i] /= max;
+            for (int i = 0; i < (int)data.size(); ++i) data[i] /= max;
         }
     }
     break;