diff options
| author | Jamie Bullock <jamie@postlude.co.uk> | 2006-12-09 11:42:13 +0000 |
|---|---|---|
| committer | Jamie Bullock <jamie@postlude.co.uk> | 2006-12-09 11:42:13 +0000 |
| commit | 8c199a3c2e5107a51f048d48bc581c9961d70373 (patch) | |
| tree | 122a2ddedf34fafdffa79af7b2c163e02c40e81d | |
| parent | bd8f6a4f7e1643be55b4e64daf97793fa2e85a2f (diff) | |
| download | LibXtract-8c199a3c2e5107a51f048d48bc581c9961d70373.tar.gz LibXtract-8c199a3c2e5107a51f048d48bc581c9961d70373.tar.bz2 LibXtract-8c199a3c2e5107a51f048d48bc581c9961d70373.zip | |
Fixed typos in scalar.c (thanks to Chris Cannam) and added -Wall to
CFLAGS so this doesn't happen again!
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | src/scalar.c | 24 |
2 files changed, 14 insertions, 14 deletions
diff --git a/configure.in b/configure.in index 84b197b..8d25fe8 100644 --- a/configure.in +++ b/configure.in @@ -64,7 +64,7 @@ AC_ARG_ENABLE(simpletest, # age to 0. XTRACT_SO_VERSION=0:0:0 -CFLAGS="$CFLAGS -pedantic -ansi" +CFLAGS="$CFLAGS -pedantic -ansi -Wall" LDFLAGS="$LDFLAGS -lm" AC_ARG_WITH(pd_dir, @@ -132,7 +132,7 @@ AC_ARG_ENABLE(debug, if test "$with_debug" = "yes" then AC_DEFINE(DEBUG,1,[Define to enable debug]) - CFLAGS="-O0 -ggdb -g -pedantic -ansi" + CFLAGS="-O0 -ggdb -g -pedantic -ansi -Wall" fi dnl ------------------------------------------ diff --git a/src/scalar.c b/src/scalar.c index d5d9837..b2bf0b0 100644 --- a/src/scalar.c +++ b/src/scalar.c @@ -87,9 +87,9 @@ int xtract_kurtosis(float *data, int N, void *argv, float *result){ int xtract_centroid(float *data, int N, void *argv, float *result){ - int n = N; + int n = (N >> 1); - float *freqs, *amps, FA, A; + float *freqs, *amps, FA = 0.f, A = 0.f; freqs = data; amps = data + (N >> 1); @@ -106,7 +106,7 @@ int xtract_centroid(float *data, int N, void *argv, float *result){ int xtract_irregularity_k(float *data, int N, void *argv, float *result){ int n, - M = M - 1; + M = N - 1; for(n = 1; n < M; n++) *result += abs(data[n] - (data[n-1] + data[n] + data[n+1]) / 3); @@ -117,7 +117,7 @@ int xtract_irregularity_j(float *data, int N, void *argv, float *result){ int n = N; - float num, den; + float num = 0.f, den = 0.f; while(n--){ num += data[n] - data[n+1]; @@ -132,7 +132,7 @@ int xtract_tristimulus_1(float *data, int N, void *argv, float *result){ int n = N; - float den; + float den = 0.f; while(n--) den += data[n]; @@ -145,7 +145,7 @@ int xtract_tristimulus_2(float *data, int N, void *argv, float *result){ int n = N; - float den; + float den = 0.f; while(n--) den += data[n]; @@ -158,7 +158,7 @@ int xtract_tristimulus_3(float *data, int N, void *argv, float *result){ int n = N; - float den, num; + float den = 0.f, num = 0.f; while(n--) den += data[n]; @@ -187,7 +187,7 @@ int xtract_spread(float *data, int N, void *argv, float *result){ int n = N; - float num, den, tmp; + float num = 0.f, den = 0.f, tmp; while(n--){ tmp = n - *(float *)argv; @@ -213,7 +213,7 @@ int xtract_zcr(float *data, int N, void *argv, float *result){ int xtract_rolloff(float *data, int N, void *argv, float *result){ int n = N; - float pivot, temp; + float pivot = 0.f, temp = 0.f; while(n--) pivot += data[n]; @@ -240,7 +240,7 @@ int xtract_flatness(float *data, int N, void *argv, float *result){ int n = N; - float num, den; + float num = 0.f, den = 0.f; while(n--){ if(data[n] !=0){ @@ -293,7 +293,7 @@ int xtract_rms_amplitude(float *data, int N, void *argv, float *result){ int xtract_inharmonicity(float *data, int N, void *argv, float *result){ int n = N; - float num, den, + float num = 0.f, den = 0.f, *fund, *freq; fund = *(float **)argv; @@ -319,7 +319,7 @@ int xtract_odd_even_ratio(float *data, int N, void *argv, float *result){ int n = N >> 1, j, k; - float num, den; + float num = 0.f, den = 0.f; while(n--){ j = n * 2; |