diff options
| author | Travis Oliphant <oliphant@enthought.com> | 2006-01-04 22:44:50 +0000 |
|---|---|---|
| committer | Travis Oliphant <oliphant@enthought.com> | 2006-01-04 22:44:50 +0000 |
| commit | 6d2d01b757e78d2c0487ec22e2101467686b2a7f (patch) | |
| tree | b5442b2e548d87fe308b500c698b24115f41042c | |
| parent | 5cfcf93bf09c3a78654099ddcb3b7b184e8d4615 (diff) | |
| download | numpy-6d2d01b757e78d2c0487ec22e2101467686b2a7f.tar.gz | |
Fix up numpy
| -rw-r--r-- | numpy/core/src/multiarraymodule.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/numpy/core/src/multiarraymodule.c b/numpy/core/src/multiarraymodule.c index 7f6ceb8a9..09ef452b5 100644 --- a/numpy/core/src/multiarraymodule.c +++ b/numpy/core/src/multiarraymodule.c @@ -1872,7 +1872,7 @@ argsort_static_compare(const void *ip1, const void *ip2) static PyObject * PyArray_ArgSort(PyArrayObject *op, int axis, PyArray_SORTKIND which) { - PyArrayObject *ap=NULL, *ret, *store; + PyArrayObject *ap=NULL, *ret=NULL, *store; intp *ip; intp i, j, n, m, orign; int argsort_elsize; @@ -1973,6 +1973,7 @@ PyArray_LexSort(PyObject *sort_keys, int axis) int needcopy=0, i,j; intp N, size; int elsize; + int maxelsize; intp astride, rstride, *iptr; PyArray_ArgSortFunc *argsort; @@ -2044,16 +2045,19 @@ PyArray_LexSort(PyObject *sort_keys, int axis) N = mps[0]->dimensions[axis]; rstride = PyArray_STRIDE(ret,axis); + maxelsize = mps[0]->descr->elsize; needcopy = (rstride != sizeof(intp)); for (j=0; j<n && !needcopy; j++) { needcopy = !(mps[j]->flags & ALIGNED) || \ (mps[j]->strides[axis] != (intp)mps[j]->descr->elsize); + if (mps[j]->descr->elsize > maxelsize) + maxelsize = mps[j]->descr->elsize; } if (needcopy) { char *valbuffer, *indbuffer; - valbuffer = PyDataMem_NEW(N*(elsize+sizeof(intp))); - indbuffer = valbuffer + (N*elsize); + valbuffer = PyDataMem_NEW(N*(maxelsize+sizeof(intp))); + indbuffer = valbuffer + (N*maxelsize); while (size--) { iptr = (intp *)indbuffer; for (i=0; i<N; i++) *iptr++ = i; |