From 74d5bbdfa7f9fa3b9daedeea07862a1ccbf519df Mon Sep 17 00:00:00 2001
From: Travis Oliphant <oliphant@enthought.com>
Date: Thu, 16 Feb 2006 22:21:05 +0000
Subject: Fix problems with isfortran test.  Always test before committing ...

---
 numpy/core/src/arrayobject.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'numpy/core/src')

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;
-- 
cgit v1.2.1