aboutsummaryrefslogtreecommitdiff
path: root/src/init.c
diff options
context:
space:
mode:
authorJamie Bullock <jamie@jamiebullock.com>2014-03-27 14:56:36 +0000
committerJamie Bullock <jamie@jamiebullock.com>2014-03-27 14:56:36 +0000
commitf5423497d2d4718fc3385003329a135ee8078615 (patch)
tree0669b31b8ca90444b4e92c7c239568d2729c11c9 /src/init.c
parent0bb0f22ddec2de97f7938916c9cf278b99e6a9e7 (diff)
parent8e718bfda48218dc4f007cad578d308227f2bb41 (diff)
downloadLibXtract-f5423497d2d4718fc3385003329a135ee8078615.tar.gz
LibXtract-f5423497d2d4718fc3385003329a135ee8078615.tar.bz2
LibXtract-f5423497d2d4718fc3385003329a135ee8078615.zip
Merge pull request #58 from q-depot/master
add VC2012 project to compile static and dynamic lib, also fix some C
Diffstat (limited to 'src/init.c')
-rw-r--r--src/init.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/init.c b/src/init.c
index a65e33a..f7962fa 100644
--- a/src/init.c
+++ b/src/init.c
@@ -43,7 +43,7 @@
#ifdef USE_OOURA
void xtract_init_ooura_data(xtract_ooura_data *ooura_data, unsigned int N)
{
- ooura_data->ooura_ip = (int *)calloc(2 + sqrt(N), sizeof(int));
+ ooura_data->ooura_ip = (int *)calloc(2 + sqrt((double)N), sizeof(int));
ooura_data->ooura_w = (double *)calloc(N * 5 / 4, sizeof(double));
ooura_data->initialised = true;
}
@@ -397,7 +397,7 @@ double *xtract_init_window(const int N, const int type)
{
double *window;
- window = malloc(N * sizeof(double));
+ window = (double*)malloc(N * sizeof(double));
switch (type)
{
@@ -444,7 +444,7 @@ void xtract_free_window(double *window)
#ifdef __GNUC__
__attribute__((constructor)) void init()
#else
-void _init()ยท
+void _init()
#endif
{
#ifdef USE_OOURA