From 5fe601c3f693ee4ac1569ba93e3614fd9a0f7501 Mon Sep 17 00:00:00 2001 From: Jamie Bullock Date: Wed, 2 Jan 2008 02:26:13 +0000 Subject: - Re-factoring in xtract_spectrum and fixed normalisation bug - Fixed bug in xtract_lnorm --- src/delta.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/delta.c') diff --git a/src/delta.c b/src/delta.c index 1591db3..25d380b 100644 --- a/src/delta.c +++ b/src/delta.c @@ -35,21 +35,21 @@ int xtract_lnorm(const float *data, const int N, const void *argv , float *resul int n, type; - float order, - temp = 0.f; + float order; order = *(float *)argv; - type = (int)*(float *)argv+1; + type = *((float *)argv+1); order = order > 0 ? order : 2.f; + *result = 0.f; + switch(type){ case XTRACT_POSITIVE_SLOPE: for(n = 0; n < N; n++){ - temp = powf(data[n], order); if(data[n] > 0) - *result += temp; + *result += powf(data[n], order); } break; default: -- cgit v1.2.3