Mercurial > hg > qm-dsp
comparison maths/MathUtilities.cpp @ 102:37449f085a4c
Fix compiler warnings
author | Chris Cannam |
---|---|
date | Thu, 13 Jun 2013 10:23:09 +0100 |
parents | e5907ae6de17 |
children | a37635bbb2c1 |
comparison
equal
deleted
inserted
replaced
101:452615c4bab4 | 102:37449f085a4c |
---|---|
153 unsigned int start, | 153 unsigned int start, |
154 unsigned int count) | 154 unsigned int count) |
155 { | 155 { |
156 double sum = 0.; | 156 double sum = 0.; |
157 | 157 |
158 for (int i = 0; i < count; ++i) | 158 for (int i = 0; i < (int)count; ++i) |
159 { | 159 { |
160 sum += src[start + i]; | 160 sum += src[start + i]; |
161 } | 161 } |
162 | 162 |
163 return sum / count; | 163 return sum / count; |
165 | 165 |
166 void MathUtilities::getFrameMinMax(const double *data, unsigned int len, double *min, double *max) | 166 void MathUtilities::getFrameMinMax(const double *data, unsigned int len, double *min, double *max) |
167 { | 167 { |
168 unsigned int i; | 168 unsigned int i; |
169 double temp = 0.0; | 169 double temp = 0.0; |
170 double a=0.0; | |
171 | 170 |
172 if (len == 0) { | 171 if (len == 0) { |
173 *min = *max = 0; | 172 *min = *max = 0; |
174 return; | 173 return; |
175 } | 174 } |
315 case NormaliseNone: return; | 314 case NormaliseNone: return; |
316 | 315 |
317 case NormaliseUnitSum: | 316 case NormaliseUnitSum: |
318 { | 317 { |
319 double sum = 0.0; | 318 double sum = 0.0; |
320 for (int i = 0; i < data.size(); ++i) sum += data[i]; | 319 for (int i = 0; i < (int)data.size(); ++i) sum += data[i]; |
321 if (sum != 0.0) { | 320 if (sum != 0.0) { |
322 for (int i = 0; i < data.size(); ++i) data[i] /= sum; | 321 for (int i = 0; i < (int)data.size(); ++i) data[i] /= sum; |
323 } | 322 } |
324 } | 323 } |
325 break; | 324 break; |
326 | 325 |
327 case NormaliseUnitMax: | 326 case NormaliseUnitMax: |
328 { | 327 { |
329 double max = 0.0; | 328 double max = 0.0; |
330 for (int i = 0; i < data.size(); ++i) { | 329 for (int i = 0; i < (int)data.size(); ++i) { |
331 if (fabs(data[i]) > max) max = fabs(data[i]); | 330 if (fabs(data[i]) > max) max = fabs(data[i]); |
332 } | 331 } |
333 if (max != 0.0) { | 332 if (max != 0.0) { |
334 for (int i = 0; i < data.size(); ++i) data[i] /= max; | 333 for (int i = 0; i < (int)data.size(); ++i) data[i] /= max; |
335 } | 334 } |
336 } | 335 } |
337 break; | 336 break; |
338 | 337 |
339 } | 338 } |