# HG changeset patch
# User Jamie Bullock <jamie@jamiebullock.com>
# Date 1363351617 25200
# Node ID 069b2f719dd44e0773362564bddb1259e339f47a
# Parent  32b78d95f7fde920b2a31934300ce759066213ec# Parent  b25e9878c55abe7849c303d96f4bb6c58e9dfe4b
Merge pull request #13 from felixonmars/master

fix for automake 1.13

diff -r b25e9878c55a -r 069b2f719dd4 examples/simpletest/simpletest.c
--- a/examples/simpletest/simpletest.c	Fri Feb 08 19:50:27 2013 +0800
+++ b/examples/simpletest/simpletest.c	Fri Mar 15 05:46:57 2013 -0700
@@ -50,7 +50,7 @@
     }
 
     /* get the mean of the input */
-    xtract[XTRACT_MEAN]((void *)&input, BLOCKSIZE, NULL, (void *)&mean);
+    xtract[XTRACT_MEAN](input, BLOCKSIZE, NULL, &mean);
     printf("\nInput mean = %.2f\n\n", mean);
 
     /* get the spectrum */
@@ -60,7 +60,7 @@
     argd[3] = 0.f; /* No Normalisation */
 
     xtract_init_fft(BLOCKSIZE, XTRACT_SPECTRUM);
-    xtract[XTRACT_SPECTRUM]((void *)&input, BLOCKSIZE, &argd[0], (void *)&spectrum[0]);
+    xtract[XTRACT_SPECTRUM](input, BLOCKSIZE, &argd[0], spectrum);
 
     /* print the spectral bins */
     printf("\nSpectral bins:\n");
@@ -71,10 +71,10 @@
 
     /* compute the MFCCs */
     mel_filters.n_filters = MFCC_FREQ_BANDS;
-    mel_filters.filters   = malloc(MFCC_FREQ_BANDS * sizeof(double *));
+    mel_filters.filters   = (double **)malloc(MFCC_FREQ_BANDS * sizeof(double *));
     for(n = 0; n < MFCC_FREQ_BANDS; ++n)
     {
-        mel_filters.filters[n] = malloc(BLOCKSIZE * sizeof(double));
+        mel_filters.filters[n] = (double *)malloc(BLOCKSIZE * sizeof(double));
     }
 
     xtract_init_mfcc(BLOCKSIZE >> 1, SAMPLERATE >> 1, XTRACT_EQUAL_GAIN, MFCC_FREQ_MIN, MFCC_FREQ_MAX, mel_filters.n_filters, mel_filters.filters);