diff options
| author | Sebastian Berg <sebastian@sipsolutions.net> | 2012-10-21 18:38:34 +0200 |
|---|---|---|
| committer | Sebastian Berg <sebastian@sipsolutions.net> | 2012-10-21 18:38:34 +0200 |
| commit | 0e10f55839ee0c2dc361f0a74990cbe8d83a66fd (patch) | |
| tree | 044d3a644157938dcaa2af2fa30f18088f027243 | |
| parent | 4b281479db093a55c010610ad287c75beb6da13b (diff) | |
| download | numpy-0e10f55839ee0c2dc361f0a74990cbe8d83a66fd.tar.gz | |
BUG: Replace ISFORTRAN by IS_F_CONTIGUOUS.
In a few places ISFORTRAN was used to check for f-contiguouity.
This is incorrect, since ISFORTRAN never evaluated to True if
the array was also c-contiguous.
| -rw-r--r-- | numpy/core/src/multiarray/convert.c | 4 | ||||
| -rw-r--r-- | numpy/core/src/multiarray/multiarraymodule.c | 4 | ||||
| -rw-r--r-- | numpy/core/src/multiarray/shape.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/numpy/core/src/multiarray/convert.c b/numpy/core/src/multiarray/convert.c index 8b646e59b..e3dd78b9f 100644 --- a/numpy/core/src/multiarray/convert.c +++ b/numpy/core/src/multiarray/convert.c @@ -265,8 +265,8 @@ PyArray_ToString(PyArrayObject *self, NPY_ORDER order) */ numbytes = PyArray_NBYTES(self); - if ((PyArray_ISCONTIGUOUS(self) && (order == NPY_CORDER)) - || (PyArray_ISFORTRAN(self) && (order == NPY_FORTRANORDER))) { + if ((PyArray_IS_C_CONTIGUOUS(self) && (order == NPY_CORDER)) + || (PyArray_IS_F_CONTIGUOUS(self) && (order == NPY_FORTRANORDER))) { ret = PyBytes_FromStringAndSize(PyArray_DATA(self), (Py_ssize_t) numbytes); } else { diff --git a/numpy/core/src/multiarray/multiarraymodule.c b/numpy/core/src/multiarray/multiarraymodule.c index 6ad0eb211..133652a90 100644 --- a/numpy/core/src/multiarray/multiarraymodule.c +++ b/numpy/core/src/multiarray/multiarraymodule.c @@ -1566,8 +1566,8 @@ _prepend_ones(PyArrayObject *arr, int nd, int ndmin, NPY_ORDER order) #define STRIDING_OK(op, order) \ ((order) == NPY_ANYORDER || \ (order) == NPY_KEEPORDER || \ - ((order) == NPY_CORDER && PyArray_ISCONTIGUOUS(op)) || \ - ((order) == NPY_FORTRANORDER && PyArray_ISFORTRAN(op))) + ((order) == NPY_CORDER && PyArray_IS_C_CONTIGUOUS(op)) || \ + ((order) == NPY_FORTRANORDER && PyArray_IS_F_CONTIGUOUS(op))) static PyObject * _array_fromobject(PyObject *NPY_UNUSED(ignored), PyObject *args, PyObject *kws) diff --git a/numpy/core/src/multiarray/shape.c b/numpy/core/src/multiarray/shape.c index 2dcf53d55..33ec6a629 100644 --- a/numpy/core/src/multiarray/shape.c +++ b/numpy/core/src/multiarray/shape.c @@ -1015,10 +1015,10 @@ PyArray_Ravel(PyArrayObject *arr, NPY_ORDER order) } } - if (order == NPY_CORDER && PyArray_ISCONTIGUOUS(arr)) { + if (order == NPY_CORDER && PyArray_IS_C_CONTIGUOUS(arr)) { return PyArray_Newshape(arr, &newdim, NPY_CORDER); } - else if (order == NPY_FORTRANORDER && PyArray_ISFORTRAN(arr)) { + else if (order == NPY_FORTRANORDER && PyArray_IS_F_CONTIGUOUS(arr)) { return PyArray_Newshape(arr, &newdim, NPY_FORTRANORDER); } /* For KEEPORDER, check if we can make a flattened view */ |