diff options
author | David Cournapeau <cournape@gmail.com> | 2009-03-03 12:23:36 +0000 |
---|---|---|
committer | David Cournapeau <cournape@gmail.com> | 2009-03-03 12:23:36 +0000 |
commit | d842f52d18f9ced1531f1827486b0536bb001529 (patch) | |
tree | 6419469370795783d10959f08882eb5a8625651f /numpy/core/src/multiarraymodule.c | |
parent | f16931309bbc060a6c00d479f41c82163ebf50e5 (diff) | |
download | numpy-d842f52d18f9ced1531f1827486b0536bb001529.tar.gz |
Revert r6528 (crashes on windows). I think the bug is only hidden for now, and there may be a leak somewhere in PyArray_PutMask function; should investigate for 1.3.0.
Diffstat (limited to 'numpy/core/src/multiarraymodule.c')
-rw-r--r-- | numpy/core/src/multiarraymodule.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/numpy/core/src/multiarraymodule.c b/numpy/core/src/multiarraymodule.c index afdcb004a..83c9ed40d 100644 --- a/numpy/core/src/multiarraymodule.c +++ b/numpy/core/src/multiarraymodule.c @@ -4616,7 +4616,7 @@ PyArray_PutMask(PyArrayObject *self, PyObject* values0, PyObject* mask0) "be an array"); return NULL; } - if (!PyArray_ISCONTIGUOUS(self) || !(self->flags & ALIGNED)) { + if (!PyArray_ISCONTIGUOUS(self)) { PyArrayObject *obj; int flags = NPY_CARRAY | NPY_UPDATEIFCOPY; |