summaryrefslogtreecommitdiff
path: root/scipy/base/src
diff options
context:
space:
mode:
authorTravis Oliphant <oliphant@enthought.com>2005-09-28 10:02:03 +0000
committerTravis Oliphant <oliphant@enthought.com>2005-09-28 10:02:03 +0000
commit07a2484e565aeb05a93b0b716160524b42032ab5 (patch)
tree3994d79fa2a2c30878fe82ff0915f5ef3725cd3e /scipy/base/src
parentb5ec235f1e0f149867450dfc3b48386ca1797c05 (diff)
downloadnumpy-07a2484e565aeb05a93b0b716160524b42032ab5.tar.gz
Fixed bugs.
Diffstat (limited to 'scipy/base/src')
-rw-r--r--scipy/base/src/arrayobject.c2
-rw-r--r--scipy/base/src/ufuncobject.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/scipy/base/src/arrayobject.c b/scipy/base/src/arrayobject.c
index c70c208e5..e07f2f08c 100644
--- a/scipy/base/src/arrayobject.c
+++ b/scipy/base/src/arrayobject.c
@@ -5888,7 +5888,7 @@ iter_ass_sub_int(PyArrayIterObject *self, PyArrayObject *ind,
}
ind_it = (PyArrayIterObject *)PyArray_IterNew((PyObject *)ind);
if (ind_it == NULL) return -1;
- index = self->size;
+ index = ind_it->size;
while(index--) {
num = *((intp *)(ind_it->dataptr));
if (num < 0) num += self->size;
diff --git a/scipy/base/src/ufuncobject.c b/scipy/base/src/ufuncobject.c
index e38a273a8..35e421628 100644
--- a/scipy/base/src/ufuncobject.c
+++ b/scipy/base/src/ufuncobject.c
@@ -2049,7 +2049,7 @@ static PyObject *
PyUFunc_GenericReduction(PyUFuncObject *self, PyObject *args,
PyObject *kwds, int operation)
{
- int axis=-1;
+ int axis=0;
PyArrayObject *mp, *ret = NULL;
PyObject *op, *res=NULL;
PyObject *obj_ind;