diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2015-11-03 09:15:12 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2015-11-04 14:17:52 -0700 |
| commit | cbfd9370ee273ef8f7694d1c689649e98d8ee08b (patch) | |
| tree | 5b6453ec73781d05643a278800a413e9e9651c59 /tools | |
| parent | 2bc5cb9a19027704d13f06b02c0bbd07e6aebd29 (diff) | |
| download | numpy-cbfd9370ee273ef8f7694d1c689649e98d8ee08b.tar.gz | |
BUG: Fix swig make_fortran function.
The function was calling PyArray_FromArray with NPY_FORTRANORDER instead
of NPY_ARRAY_F_CONTIGUOUS. The first is of type NPY_ORDER and the second
is a flag.
Closes #6618. [ci skip]
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/swig/numpy.i | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/swig/numpy.i b/tools/swig/numpy.i index 11fcd42fe..67a519e6d 100644 --- a/tools/swig/numpy.i +++ b/tools/swig/numpy.i @@ -295,7 +295,7 @@ Py_INCREF(array_descr(ary)); result = (PyArrayObject*) PyArray_FromArray(ary, array_descr(ary), - NPY_FORTRANORDER); + NPY_ARRAY_F_CONTIGUOUS); *is_new_object = 1; } return result; |