# HG changeset patch # User Jamie Bullock # Date 1333023784 0 # Node ID 2bdf5e248870384bc141008353a4d27e8e64d7b9 # Parent fc4bc58b92da98b970a8737a920cb2f9178e9050 - fixed build-time bug. in some cases average_deviation was commented out instead of spectral_average_deviation diff -r fc4bc58b92da -r 2bdf5e248870 src/libxtract.c --- a/src/libxtract.c Thu Mar 31 12:22:29 2011 +0000 +++ b/src/libxtract.c Thu Mar 29 12:23:04 2012 +0000 @@ -27,13 +27,13 @@ xtract_mean, xtract_variance, xtract_standard_deviation, - /* xtract_average_deviation, */ + xtract_average_deviation, xtract_skewness, xtract_kurtosis, xtract_spectral_mean, xtract_spectral_variance, xtract_spectral_standard_deviation, - xtract_spectral_average_deviation, + /* xtract_spectral_average_deviation, */ xtract_spectral_skewness, xtract_spectral_kurtosis, xtract_spectral_centroid, diff -r fc4bc58b92da -r 2bdf5e248870 xtract/xtract_scalar.h --- a/xtract/xtract_scalar.h Thu Mar 31 12:22:29 2011 +0000 +++ b/xtract/xtract_scalar.h Thu Mar 29 12:23:04 2012 +0000 @@ -71,8 +71,8 @@ * \param *argv: a pointer to a float representing the mean of the input vector * \param *result: the average deviation of N values from the array pointed to by *data */ -/*int xtract_average_deviation(const float *data, const int N, const void *argv, float *result); - */ +int xtract_average_deviation(const float *data, const int N, const void *argv, float *result); + /** \brief Extract the skewness of an input vector * @@ -127,7 +127,9 @@ * \param *argv: a pointer to a float representing the spectral mean of the input spectrum * \param *result: the average deviation of the spectrum pointed to by *data */ +/* int xtract_spectral_average_deviation(const float *data, const int N, const void *argv, float *result); +*/ /** \brief Extract the skewness of an input spectrum *