Mercurial > hg > libxtract
changeset 83:5fadbacdb2a7
Minor mods and typos corrections that were lurking uncommitted
| author | Jamie Bullock <jamie@postlude.co.uk> |
|---|---|
| date | Mon, 20 Aug 2007 08:12:04 +0000 |
| parents | b1afb3a257b6 |
| children | 7c8edb20f740 |
| files | TODO src/scalar.c xtract/libxtract.h xtract/xtract_scalar.h xtract/xtract_vector.h |
| diffstat | 5 files changed, 12 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/TODO Sun Aug 19 21:54:10 2007 +0000 +++ b/TODO Mon Aug 20 08:12:04 2007 +0000 @@ -1,3 +1,4 @@ +Add -fPIC in intelligent way to build system for 64-bit builds Rationalise use of powf etc. vs pow Add spectral_flux Add geometric_mean
--- a/src/scalar.c Sun Aug 19 21:54:10 2007 +0000 +++ b/src/scalar.c Mon Aug 20 08:12:04 2007 +0000 @@ -350,7 +350,10 @@ int n = N; - float num = 0.f, den = 0.f, temp; + float num = 0.f, den = 0.f, temp = 0.f; + + if(argv == NULL) + return XTRACT_BAD_ARGV; while(n--){ temp = n - *(float *)argv;
--- a/xtract/libxtract.h Sun Aug 19 21:54:10 2007 +0000 +++ b/xtract/libxtract.h Mon Aug 20 08:12:04 2007 +0000 @@ -27,6 +27,9 @@ * * Hopefully this not only makes the library more efficient when computing large numbers of features, but also makes it more flexible because extraction functions can be combined arbitrarily (one can take the irregularility of the Mel Frequency Cepstral Coefficients for example). * + * + * LibXtract can be downloaded from http://www.sf.net/projects/libxtract + * */ #ifndef XTRACT_H
--- a/xtract/xtract_scalar.h Sun Aug 19 21:54:10 2007 +0000 +++ b/xtract/xtract_scalar.h Mon Aug 20 08:12:04 2007 +0000 @@ -28,7 +28,7 @@ #endif /** - * \defgroup scalar extraction functions + * \defgroup scalar scalar extraction functions * * Defines scalar extraction functions, and their parameters. * @{ @@ -200,7 +200,7 @@ * * \param *data: a pointer to the first element in an array of floats representing the magnitude coefficients from the spectrum of an audio vector, (e.g. the first half of the array pointed to by *result from xtract_spectrum(). * \param N: the number of elements to be considered - * \param *argv: a pointer to NULL + * \param *argv: a pointer to a float corresponding to the spectral centroid * \param *result: the spectral spread of N values from the array pointed to by *data */ int xtract_spread(const float *data, const int N, const void *argv, float *result);
--- a/xtract/xtract_vector.h Sun Aug 19 21:54:10 2007 +0000 +++ b/xtract/xtract_vector.h Mon Aug 20 08:12:04 2007 +0000 @@ -28,9 +28,9 @@ #endif /** - * \defgroup vector extraction functions + * \defgroup vector vector extraction functions * - * Defines vectorr extraction functions, and their parameters. + * Defines vector extraction functions, and their parameters. * @{ */