diff options
| author | Mark Wiebe <mwwiebe@gmail.com> | 2011-03-13 17:17:51 -0700 |
|---|---|---|
| committer | Mark Wiebe <mwwiebe@gmail.com> | 2011-03-13 17:44:47 -0700 |
| commit | c5c3cb94ceeba095df0f1e3566d0a52d005d1bbf (patch) | |
| tree | 826790c2e1c3c4ca45a2ad90a3b27f5dcfd3d98b /numpy/lib/src | |
| parent | c3f4e890e88a06866b467221d90cf8b71f83c2c5 (diff) | |
| download | numpy-c5c3cb94ceeba095df0f1e3566d0a52d005d1bbf.tar.gz | |
API: Simplify basic iterator constructors, add 'itershape' to advanced iterator constructor
Diffstat (limited to 'numpy/lib/src')
| -rw-r--r-- | numpy/lib/src/_compiled_base.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/numpy/lib/src/_compiled_base.c b/numpy/lib/src/_compiled_base.c index b44cfb471..d1b2b2c6a 100644 --- a/numpy/lib/src/_compiled_base.c +++ b/numpy/lib/src/_compiled_base.c @@ -679,7 +679,8 @@ static PyObject * arr_ravel_coords(PyObject *self, PyObject *args, PyObject *kwds) { int i, s; - PyObject *mode0=NULL, *coords0=NULL, *ret; + PyObject *mode0=NULL, *coords0=NULL; + PyArrayObject *ret = NULL; PyArray_Dims dimensions={0,0}; npy_intp ravel_strides[NPY_MAXDIMS]; PyArray_ORDER order = NPY_CORDER; @@ -758,8 +759,7 @@ arr_ravel_coords(PyObject *self, PyObject *args, PyObject *kwds) NPY_ITER_ZEROSIZE_OK, NPY_KEEPORDER, NPY_SAME_KIND_CASTING, - op_flags, dtype, - 0, NULL, 0); + op_flags, dtype); if (iter == NULL) { goto fail; } @@ -787,7 +787,7 @@ arr_ravel_coords(PyObject *self, PyObject *args, PyObject *kwds) } while(iternext(iter)); } - ret = (PyObject *)NpyIter_GetOperandArray(iter)[dimensions.len]; + ret = NpyIter_GetOperandArray(iter)[dimensions.len]; Py_INCREF(ret); Py_DECREF(dtype[0]); @@ -925,7 +925,7 @@ arr_unravel_index(PyObject *self, PyObject *args, PyObject *kwds) NPY_ITER_DONT_NEGATE_STRIDES| NPY_ITER_COORDS, NPY_KEEPORDER, NPY_SAME_KIND_CASTING, - dtype, 0, NULL, 0); + dtype); if (iter == NULL) { goto fail; } |