diff options
| author | mattip <matti.picus@gmail.com> | 2018-04-07 22:51:31 +0300 |
|---|---|---|
| committer | mattip <matti.picus@gmail.com> | 2018-04-21 23:53:44 +0300 |
| commit | d15c30fc89345fbf0285f5f2d31c7193a07bec2b (patch) | |
| tree | c8837b385bd57bed2dd7742e769befa680ccfc09 /numpy/core/include | |
| parent | 05d94b9f59f2ca8e9dbc82fd01ac31a6b6aa34d7 (diff) | |
| download | numpy-d15c30fc89345fbf0285f5f2d31c7193a07bec2b.tar.gz | |
fix from review
Diffstat (limited to 'numpy/core/include')
| -rw-r--r-- | numpy/core/include/numpy/ndarrayobject.h | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/numpy/core/include/numpy/ndarrayobject.h b/numpy/core/include/numpy/ndarrayobject.h index 97e41b6f3..f17008b0b 100644 --- a/numpy/core/include/numpy/ndarrayobject.h +++ b/numpy/core/include/numpy/ndarrayobject.h @@ -174,15 +174,12 @@ extern "C" CONFUSE_EMACS static NPY_INLINE void PyArray_DiscardWritebackIfCopy(PyArrayObject *arr) { - if (arr != NULL) { - PyArrayObject_fields *fa = (PyArrayObject_fields *)arr; - if ((PyArray_FLAGS(arr) & NPY_ARRAY_WRITEBACKIFCOPY) || - (PyArray_FLAGS(arr) & NPY_ARRAY_UPDATEIFCOPY)) { - if (fa->base) { - PyArray_ENABLEFLAGS((PyArrayObject*)fa->base, NPY_ARRAY_WRITEABLE); - Py_DECREF(fa->base); - fa->base = NULL; - } + PyArrayObject_fields *fa = (PyArrayObject_fields *)arr; + if (fa && fa->base) { + if ((fa->flags & NPY_ARRAY_UPDATEIFCOPY) || (fa->flags & NPY_ARRAY_WRITEBACKIFCOPY)) { + PyArray_ENABLEFLAGS((PyArrayObject*)fa->base, NPY_ARRAY_WRITEABLE); + Py_DECREF(fa->base); + fa->base = NULL; PyArray_CLEARFLAGS(arr, NPY_ARRAY_WRITEBACKIFCOPY); PyArray_CLEARFLAGS(arr, NPY_ARRAY_UPDATEIFCOPY); } |