diff options
| author | Travis Oliphant <oliphant@enthought.com> | 2007-05-22 23:33:01 +0000 |
|---|---|---|
| committer | Travis Oliphant <oliphant@enthought.com> | 2007-05-22 23:33:01 +0000 |
| commit | 984df2b3aba4e4131d9b58de6e4d880e497ac0bb (patch) | |
| tree | b363ae6afda6261ae8c2b8eaff6e13fbcf27f728 /numpy/core/src/arraymethods.c | |
| parent | 74057dee709fe3e48d24f5afabd3ffb5ffc72888 (diff) | |
| download | numpy-984df2b3aba4e4131d9b58de6e4d880e497ac0bb.tar.gz | |
Remove tests for inequality on unicode scalars --- not sure why they were there in the first place. Fix bug in masked_array.
Diffstat (limited to 'numpy/core/src/arraymethods.c')
| -rw-r--r-- | numpy/core/src/arraymethods.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/numpy/core/src/arraymethods.c b/numpy/core/src/arraymethods.c index 3572633ef..54bda5d1e 100644 --- a/numpy/core/src/arraymethods.c +++ b/numpy/core/src/arraymethods.c @@ -653,14 +653,19 @@ array_cast(PyArrayObject *self, PyObject *args) &descr)) return NULL; if (descr == self->descr) { - obj = _ARET(PyArray_NewCopy(self,0)); + obj = _ARET(PyArray_NewCopy(self,NPY_ANYORDER)); Py_XDECREF(descr); return obj; } if (descr->names != NULL) { - return PyArray_FromArray(self, descr, NPY_FORCECAST); + int flags; + flags = NPY_FORCECAST; + if (PyArray_ISFORTRAN(self)) { + flags |= NPY_FORTRAN; + } + return PyArray_FromArray(self, descr, flags); } - return PyArray_CastToType(self, descr, 0); + return PyArray_CastToType(self, descr, PyArray_ISFORTRAN(self)); } /* default sub-type implementation */ |