diff options
| author | Travis Oliphant <oliphant@enthought.com> | 2005-12-31 09:21:18 +0000 |
|---|---|---|
| committer | Travis Oliphant <oliphant@enthought.com> | 2005-12-31 09:21:18 +0000 |
| commit | d32bc1dd80ee4590ff79454934ec3f0cdba5b706 (patch) | |
| tree | ea770ea14aa7ca13425ac0e51a5d1141bb4ffdb4 | |
| parent | c2e7e3f8fae9a3b0f156969eff94ba253e1050ae (diff) | |
| download | python-numpy-d32bc1dd80ee4590ff79454934ec3f0cdba5b706.tar.gz python-numpy-d32bc1dd80ee4590ff79454934ec3f0cdba5b706.tar.bz2 python-numpy-d32bc1dd80ee4590ff79454934ec3f0cdba5b706.zip | |
Fix nasty corner-case.
| -rw-r--r-- | scipy/base/src/arrayobject.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/scipy/base/src/arrayobject.c b/scipy/base/src/arrayobject.c index 3b4c8d6d1..7a43c0dea 100644 --- a/scipy/base/src/arrayobject.c +++ b/scipy/base/src/arrayobject.c @@ -6226,10 +6226,12 @@ PyArray_IterAllButAxis(PyObject *obj, int axis) PyArrayIterObject *it; it = (PyArrayIterObject *)PyArray_IterNew(obj); if (it == NULL) return NULL; - + /* adjust so that will not iterate over axis */ it->contiguous = 0; - it->size /= (it->dims_m1[axis]+1); + if (it->size != 0) { + it->size /= PyArray_DIM(obj,axis); + } it->dims_m1[axis] = 0; it->backstrides[axis] = 0; |