aboutsummaryrefslogtreecommitdiff
path: root/src/vector.c
diff options
context:
space:
mode:
authorQ <andrea@nocte.co.uk>2014-03-27 09:48:26 +0000
committerQ <andrea@nocte.co.uk>2014-03-27 09:48:26 +0000
commitcc719183cbc1fb6d2aebeb3150780d5c0e3f86e5 (patch)
tree65dcab27479085b99305a7a8a41beeefee37deb7 /src/vector.c
parent0bb0f22ddec2de97f7938916c9cf278b99e6a9e7 (diff)
downloadLibXtract-cc719183cbc1fb6d2aebeb3150780d5c0e3f86e5.tar.gz
LibXtract-cc719183cbc1fb6d2aebeb3150780d5c0e3f86e5.tar.bz2
LibXtract-cc719183cbc1fb6d2aebeb3150780d5c0e3f86e5.zip
add VC2012 project to compile static and dynamic lib, also fix some C
issues
Diffstat (limited to 'src/vector.c')
-rw-r--r--src/vector.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/vector.c b/src/vector.c
index 5074b65..9c49c2c 100644
--- a/src/vector.c
+++ b/src/vector.c
@@ -83,7 +83,7 @@ int xtract_spectrum(const double *data, const int N, const void *argv, double *r
* the output format is
* a[0] - DC, a[1] - nyquist, a[2...N-1] - remaining bins
*/
- fft = malloc(N * sizeof(double));
+ fft = (double*)malloc(N * sizeof(double));
assert(fft != NULL);
memcpy(fft, data, N * sizeof(double));
@@ -375,7 +375,7 @@ int xtract_dct(const double *data, const int N, const void *argv, double *result
int n;
int m;
- double *temp = calloc(N, sizeof(double));
+ double *temp = (double*)calloc(N, sizeof(double));
for (n = 0; n < N; ++n)
{
@@ -502,7 +502,7 @@ int xtract_peak_spectrum(const double *data, const int N, const void *argv, doub
bytes = N * sizeof(double);
if(input != NULL)
- input = memcpy(input, data, bytes);
+ input = (double*)memcpy(input, data, bytes);
else
return XTRACT_MALLOC_FAILED;
@@ -562,8 +562,8 @@ int xtract_harmonic_spectrum(const double *data, const int N, const void *argv,
if(freqs[n])
{
ratio = freqs[n] / f0;
- nearest = round(ratio);
- distance = fabs(nearest - ratio);
+ nearest = floor( 0.5f + ratio); // replace -> nearest = round(ratio);
+ distance = fabs(nearest - ratio);
if(distance > threshold)
result[n] = result[M + n] = 0.0;
else