diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2015-11-25 11:02:13 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2015-11-25 13:28:29 -0700 |
| commit | 9705c743ab340b13ab6e1ea7ff1dfb3e76299c4a (patch) | |
| tree | d435b88289191b6783524ca8c972a80ccfb4956a /numpy | |
| parent | 239917609779503d0b4071d59d5b780df6e5b575 (diff) | |
| download | numpy-9705c743ab340b13ab6e1ea7ff1dfb3e76299c4a.tar.gz | |
MAINT: Localize variables only used with relaxed stride checking.
The varibles in question lead to unused variable warnings when not
compiling with NPY_RELAXED_STRIDE_CHECKING=1 resulting in failing
travis tests.
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/core/src/multiarray/buffer.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/numpy/core/src/multiarray/buffer.c b/numpy/core/src/multiarray/buffer.c index 7f7607e1f..5fa3ba95b 100644 --- a/numpy/core/src/multiarray/buffer.c +++ b/numpy/core/src/multiarray/buffer.c @@ -629,8 +629,6 @@ array_getbuffer(PyObject *obj, Py_buffer *view, int flags) { PyArrayObject *self; _buffer_info_t *info = NULL; - int i; - Py_ssize_t sd; self = (PyArrayObject*)obj; @@ -715,15 +713,19 @@ array_getbuffer(PyObject *obj, Py_buffer *view, int flags) * regenerate strides from shape. */ if (PyArray_CHKFLAGS(self, NPY_ARRAY_C_CONTIGUOUS) && - !((flags & PyBUF_F_CONTIGUOUS) == PyBUF_F_CONTIGUOUS)) { - sd = view->itemsize; + !((flags & PyBUF_F_CONTIGUOUS) == PyBUF_F_CONTIGUOUS)) { + Py_ssize_t sd = view->itemsize; + int i; + for (i = view->ndim-1; i >= 0; --i) { view->strides[i] = sd; sd *= view->shape[i]; } } else if (PyArray_CHKFLAGS(self, NPY_ARRAY_F_CONTIGUOUS)) { - sd = view->itemsize; + Py_ssize_t sd = view->itemsize; + int i; + for (i = 0; i < view->ndim; ++i) { view->strides[i] = sd; sd *= view->shape[i]; |