##// END OF EJS Templates
schain-jc
RSS
Update NPY_ARRAY definition in C extension
Juan C. Espinoza -
r1169:668c33de071f
parent child
Show More
Side by Side Unified
Context file:
r1169:668c33de071f Loading diff...:
Show file before | Show file after | Hide comments
@@ -40,8 +40,8 static PyObject *correlateByBlock(PyObject *self, PyObject *args) {
40
40
41 if (!PyArg_ParseTuple(args, "OOi", &data_obj1, &data_obj2, &mode)) return NULL;
41 if (!PyArg_ParseTuple(args, "OOi", &data_obj1, &data_obj2, &mode)) return NULL;
42
42
43 data_array1 = (PyArrayObject *) PyArray_FROM_OTF(data_obj1, NPY_COMPLEX128, NPY_ARRAY_DEFAULT);
43 data_array1 = (PyArrayObject *) PyArray_FROM_OTF(data_obj1, NPY_COMPLEX128, NPY_ARRAY_IN_ARRAY);
44 data_array2 = (PyArrayObject *) PyArray_FROM_OTF(data_obj2, NPY_FLOAT64, NPY_ARRAY_DEFAULT);
44 data_array2 = (PyArrayObject *) PyArray_FROM_OTF(data_obj2, NPY_FLOAT64, NPY_ARRAY_IN_ARRAY);
45
45
46 npy_intp dims[1];
46 npy_intp dims[1];
47 dims[0] = 200;
47 dims[0] = 200;
@@ -100,7 +100,7 static PyObject *hildebrand_sekhon(PyObject *self, PyObject *args) {
100 PyObject *data_obj, *data_array;
100 PyObject *data_obj, *data_array;
101
101
102 if (!PyArg_ParseTuple(args, "Od", &data_obj, &navg)) return NULL;
102 if (!PyArg_ParseTuple(args, "Od", &data_obj, &navg)) return NULL;
103 data_array = PyArray_FROM_OTF(data_obj, NPY_FLOAT64, NPY_ARRAY_DEFAULT);
103 data_array = PyArray_FROM_OTF(data_obj, NPY_FLOAT64, NPY_ARRAY_IN_ARRAY);
104 if (data_array == NULL) {
104 if (data_array == NULL) {
105 Py_XDECREF(data_array);
105 Py_XDECREF(data_array);
106 Py_XDECREF(data_obj);
106 Py_XDECREF(data_obj);
General Comments 0
You need to be logged in to leave comments. Login now