diff options
| author | Travis Oliphant <oliphant@enthought.com> | 2006-02-16 22:21:05 +0000 |
|---|---|---|
| committer | Travis Oliphant <oliphant@enthought.com> | 2006-02-16 22:21:05 +0000 |
| commit | 74d5bbdfa7f9fa3b9daedeea07862a1ccbf519df (patch) | |
| tree | c64cb5b97054194ac02c7f336ef77def65ebbbee /numpy/core/src/arrayobject.c | |
| parent | 2fd136eb7977dd5172eb92d173a7c39921b0cf98 (diff) | |
| download | numpy-74d5bbdfa7f9fa3b9daedeea07862a1ccbf519df.tar.gz | |
Fix problems with isfortran test. Always test before committing ...
Diffstat (limited to 'numpy/core/src/arrayobject.c')
| -rw-r--r-- | numpy/core/src/arrayobject.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/numpy/core/src/arrayobject.c b/numpy/core/src/arrayobject.c index 12ec39c7f..a90fb7cca 100644 --- a/numpy/core/src/arrayobject.c +++ b/numpy/core/src/arrayobject.c @@ -3764,7 +3764,8 @@ PyArray_NewFromDescr(PyTypeObject *subtype, PyArray_Descr *descr, int nd, intp newdims[2*MAX_DIMS]; intp *newstrides=NULL; int isfortran=0; - isfortran = (data && (flags & FORTRAN)) || flags; + isfortran = (data && (flags & FORTRAN) && !(flags & CONTIGUOUS)) || \ + (!data && flags); memcpy(newdims, dims, nd*sizeof(intp)); if (strides) { newstrides = newdims + MAX_DIMS; |