diff options
| author | Jamie Bullock <jamie@postlude.co.uk> | 2008-01-02 02:26:13 +0000 |
|---|---|---|
| committer | Jamie Bullock <jamie@postlude.co.uk> | 2008-01-02 02:26:13 +0000 |
| commit | 5fe601c3f693ee4ac1569ba93e3614fd9a0f7501 (patch) | |
| tree | 20f75ff904e7919ce4f42633d7080927aee30257 /src/delta.c | |
| parent | 7f86524dd021c5905df111d1254004576fd872f0 (diff) | |
| download | LibXtract-5fe601c3f693ee4ac1569ba93e3614fd9a0f7501.tar.gz LibXtract-5fe601c3f693ee4ac1569ba93e3614fd9a0f7501.tar.bz2 LibXtract-5fe601c3f693ee4ac1569ba93e3614fd9a0f7501.zip | |
- Re-factoring in xtract_spectrum and fixed normalisation bug
- Fixed bug in xtract_lnorm
Diffstat (limited to 'src/delta.c')
| -rw-r--r-- | src/delta.c | 10 |
1 files changed, 5 insertions, 5 deletions
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: |