From 6a1c9c8eeeb25aca86078ec3c3997b26f1356821 Mon Sep 17 00:00:00 2001 From: Christoph Gohlke Date: Tue, 12 May 2015 15:50:52 -0700 Subject: [PATCH 1/3] Fix fatal error C1083: Cannot open include file: 'xmmininrin.h' --- scipy/spatial/ckdtree/src/ckdtree_cpp_methods.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scipy/spatial/ckdtree/src/ckdtree_cpp_methods.h b/scipy/spatial/ckdtree/src/ckdtree_cpp_methods.h index 7f6ac851663b..6aa5d2b581ce 100644 --- a/scipy/spatial/ckdtree/src/ckdtree_cpp_methods.h +++ b/scipy/spatial/ckdtree/src/ckdtree_cpp_methods.h @@ -32,7 +32,7 @@ prefetch_datapoint(const npy_float64 *x, const npy_intp m) } #else #if defined(_WIN32) -#include +#include inline void prefetch_datapoint(const npy_float64 *x, const npy_intp m) { From 092554adeda24b853b8aa69e1ad400cb6a7892eb Mon Sep 17 00:00:00 2001 From: Christoph Gohlke Date: Tue, 12 May 2015 15:52:32 -0700 Subject: [PATCH 2/3] Fix error C2036: 'void *' : unknown size --- scipy/signal/lfilter.c.src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scipy/signal/lfilter.c.src b/scipy/signal/lfilter.c.src index 004d30dcb945..0d02ce00154f 100644 --- a/scipy/signal/lfilter.c.src +++ b/scipy/signal/lfilter.c.src @@ -355,7 +355,7 @@ zfill(const PyArrayObject * x, intp nx, char *xzfilled, intp nxzfilled) if (nx > 0) { for (i = 0; i < nx; ++i) { copyswap(xzfilled + i * nxl, - PyArray_DATA((PyArrayObject *)x) + i * nxl, + (char *)PyArray_DATA((PyArrayObject *)x) + i * nxl, 0, NULL); } } From 48d8c83d60237873386b157860d8a3213127a4f0 Mon Sep 17 00:00:00 2001 From: Christoph Gohlke Date: Tue, 12 May 2015 15:53:57 -0700 Subject: [PATCH 3/3] Fix error C2036: 'void *' : unknown size --- scipy/signal/sigtoolsmodule.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scipy/signal/sigtoolsmodule.c b/scipy/signal/sigtoolsmodule.c index 67e56572ce7d..921321f25ac1 100644 --- a/scipy/signal/sigtoolsmodule.c +++ b/scipy/signal/sigtoolsmodule.c @@ -947,7 +947,7 @@ PyObject *PyArray_OrderFilterND(PyObject *op1, PyObject *op2, int order) { PyDataMem_FREE(zptr); zptr = PyArray_Zero(ap1); if (zptr == NULL) goto fail; - ap1_ptr = PyArray_DATA(ap1) + offset1*is1; + ap1_ptr = (char *)PyArray_DATA(ap1) + offset1*is1; for (k=0; k < PyArray_NDIM(ap1); k++) { a_ind[k] = mode_dep[k]; check_ind[k] = PyArray_DIMS(ap1)[k] - PyArray_DIMS(ap2)[k] - mode_dep[k] - 1;