diff options
| author | Travis Oliphant <oliphant@enthought.com> | 2005-10-10 03:32:31 +0000 |
|---|---|---|
| committer | Travis Oliphant <oliphant@enthought.com> | 2005-10-10 03:32:31 +0000 |
| commit | e8fc406e186112d6713102f2226e7be0e7ac1fbe (patch) | |
| tree | fce2826878139848002c5d2efe693bd6d7e09c24 | |
| parent | 9eda64cb9e3ca4114d716ba9c33f47a79185fe2f (diff) | |
| download | numpy-e8fc406e186112d6713102f2226e7be0e7ac1fbe.tar.gz | |
Fixed scalar stuff again.
| -rw-r--r-- | scipy/base/src/scalartypes.inc.src | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/scipy/base/src/scalartypes.inc.src b/scipy/base/src/scalartypes.inc.src index 11ea66fb7..7825fab21 100644 --- a/scipy/base/src/scalartypes.inc.src +++ b/scipy/base/src/scalartypes.inc.src @@ -186,9 +186,10 @@ gentype_@name@(PyObject *m1, PyObject *m2) /* Convert object to Array scalar and try again */ newarr = PyArray_FromAny(m1, NULL, 0, 0, 0); if (newarr!=NULL) { - ret = newarr->ob_type->tp_as_number->nb_@name@(m1, newarr); + ret = newarr->ob_type->tp_as_number->nb_@name@(newarr, m2); Py_DECREF(newarr); } + else ret=NULL; } return ret; } @@ -199,11 +200,12 @@ gentype_@name@(PyObject *m1, PyObject *m2) else { PyObject *newarr; /* Convert object to Array and try again */ - newarr = PyArray_FromAny(m1, NULL, 0, 0, 0); + newarr = PyArray_FromAny(m2, NULL, 0, 0, 0); if (newarr!=NULL) { - ret = newarr->ob_type->tp_as_number->nb_@name@(newarr, m2); + ret = newarr->ob_type->tp_as_number->nb_@name@(m1, newarr); Py_DECREF(newarr); } + else ret=NULL; } return ret; } @@ -252,9 +254,10 @@ gentype_multiply(PyObject *m1, PyObject *m2) /* Convert object to Array scalar and try again */ newarr = PyArray_FromAny(m1, NULL, 0, 0, 0); if (newarr!=NULL) { - ret = newarr->ob_type->tp_as_number->nb_multiply(m1, newarr); + ret = newarr->ob_type->tp_as_number->nb_multiply(newarr, m2); Py_DECREF(newarr); } + else ret=NULL; } return ret; } @@ -281,11 +284,12 @@ gentype_multiply(PyObject *m1, PyObject *m2) else { PyObject *newarr; /* Convert object to Array scalar and try again */ - newarr = PyArray_FromAny(m1, NULL, 0, 0, 0); + newarr = PyArray_FromAny(m2, NULL, 0, 0, 0); if (newarr!=NULL) { ret = newarr->ob_type->tp_as_number->nb_multiply(m1, newarr); Py_DECREF(newarr); } + else ret =NULL; } return ret; } |