Mercurial > hg > libxtract
changeset 37:b699a37d27c4
Fixed typos in scalar.c (thanks to Chris Cannam) and added -Wall to
CFLAGS so this doesn't happen again!
| author | Jamie Bullock <jamie@postlude.co.uk> |
|---|---|
| date | Sat, 09 Dec 2006 11:42:13 +0000 |
| parents | d8e72a79b86b |
| children | 0ea4d6430cfc |
| files | configure.in src/scalar.c |
| diffstat | 2 files changed, 14 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.in Fri Nov 10 11:52:08 2006 +0000 +++ b/configure.in Sat Dec 09 11:42:13 2006 +0000 @@ -64,7 +64,7 @@ # 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 @@ 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 ------------------------------------------
--- a/src/scalar.c Fri Nov 10 11:52:08 2006 +0000 +++ b/src/scalar.c Sat Dec 09 11:42:13 2006 +0000 @@ -87,9 +87,9 @@ 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_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 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 n = N; - float den; + float den = 0.f; while(n--) den += data[n]; @@ -145,7 +145,7 @@ int n = N; - float den; + float den = 0.f; while(n--) den += data[n]; @@ -158,7 +158,7 @@ int n = N; - float den, num; + float den = 0.f, num = 0.f; while(n--) den += data[n]; @@ -187,7 +187,7 @@ 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_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 n = N; - float num, den; + float num = 0.f, den = 0.f; while(n--){ if(data[n] !=0){ @@ -293,7 +293,7 @@ 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 n = N >> 1, j, k; - float num, den; + float num = 0.f, den = 0.f; while(n--){ j = n * 2;