diff options
| author | Travis Oliphant <oliphant@enthought.com> | 2008-02-13 05:54:52 +0000 |
|---|---|---|
| committer | Travis Oliphant <oliphant@enthought.com> | 2008-02-13 05:54:52 +0000 |
| commit | e8c4f9742339035c431f4047efd11030fd19f8ee (patch) | |
| tree | 268b30620dd499a46cdede5803c4db6270a1e657 | |
| parent | 908adda88a402d122fa3c8025c38305904a29fff (diff) | |
| download | numpy-e8c4f9742339035c431f4047efd11030fd19f8ee.tar.gz | |
Fix swap error for indexing flat attribute. The data-type of the returned object keeps the byte-swap information so there is no need to swap.
| -rw-r--r-- | THANKS.txt | 4 | ||||
| -rw-r--r-- | numpy/core/src/arrayobject.c | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/THANKS.txt b/THANKS.txt index b068f2aaf..5283abbbb 100644 --- a/THANKS.txt +++ b/THANKS.txt @@ -3,7 +3,7 @@ Jim Hugunin, Paul Dubois, Konrad Hinsen, David Ascher, and many others for Numeric on which the code is based. Perry Greenfield, J Todd Miller, Rick White, Paul Barrett for Numarray which gave much inspiration and showed the way forward. -Paul Dubois for Masked Arrays +Paul Dubois for original Masked Arrays Pearu Peterson for f2py and numpy.distutils and help with code organization Robert Kern for mtrand, bug fixes, help with distutils, code organization, and much more. @@ -34,5 +34,5 @@ Albert Strasheim for documentation, bug-fixes, regression tests and Valgrind expertise. Stefan van der Walt for documentation, bug-fixes and regression-tests. Andrew Straw for help with http://www.scipy.org, documentation, and testing. -David Cournapeau for documentation, bug-fixes, and code contributions including fast_clipping. +David Cournapeau for scons build support, doc-and-bug fixes, and code contributions including fast_clipping. Pierre Gerard-Marchant for his rewrite of the masked array functionality. diff --git a/numpy/core/src/arrayobject.c b/numpy/core/src/arrayobject.c index 95b4ae92d..a7d0b67b4 100644 --- a/numpy/core/src/arrayobject.c +++ b/numpy/core/src/arrayobject.c @@ -9283,10 +9283,9 @@ iter_subscript(PyArrayIterObject *self, PyObject *ind) 0, (PyObject *)self->ao); if (r==NULL) goto fail; dptr = PyArray_DATA(r); - swap = !PyArray_ISNOTSWAPPED(self->ao); copyswap = PyArray_DESCR(r)->f->copyswap; while(n_steps--) { - copyswap(dptr, self->dataptr, swap, r); + copyswap(dptr, self->dataptr, 0, r); start += step_size; PyArray_ITER_GOTO1D(self, start) dptr += size; |