diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2014-06-17 06:46:07 -0600 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2014-06-17 06:46:07 -0600 |
| commit | 133d4f464ed3cb8639afc075c8c097a2c6594b6d (patch) | |
| tree | 3913afb7fb3f41b142402ef75fbbc8e7dd31533f | |
| parent | ef4806acd0f76cae16c5ce47d0d591173e056e20 (diff) | |
| parent | 71fc8028beec5350b30f2f7638515ae1a8f88a7d (diff) | |
| download | numpy-133d4f464ed3cb8639afc075c8c097a2c6594b6d.tar.gz | |
Merge pull request #4809 from adamreeve/swig_typemap_fix
Fix SWIG typemaps for Fortran ordered array input
| -rw-r--r-- | tools/swig/numpy.i | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/swig/numpy.i b/tools/swig/numpy.i index e250e78bf..217acd5bf 100644 --- a/tools/swig/numpy.i +++ b/tools/swig/numpy.i @@ -872,7 +872,7 @@ (PyArrayObject* array=NULL, int is_new_object=0) { npy_intp size[2] = { -1, -1 }; - array = obj_to_array_contiguous_allow_conversion($input, + array = obj_to_array_fortran_allow_conversion($input, DATA_TYPECODE, &is_new_object); if (!array || !require_dimensions(array, 2) || @@ -1106,7 +1106,7 @@ (PyArrayObject* array=NULL, int is_new_object=0) { npy_intp size[3] = { -1, -1, -1 }; - array = obj_to_array_contiguous_allow_conversion($input, + array = obj_to_array_fortran_allow_conversion($input, DATA_TYPECODE, &is_new_object); if (!array || !require_dimensions(array, 3) || @@ -1345,7 +1345,7 @@ (PyArrayObject* array=NULL, int is_new_object=0) { npy_intp size[4] = { -1, -1, -1 , -1 }; - array = obj_to_array_contiguous_allow_conversion($input, DATA_TYPECODE, + array = obj_to_array_fortran_allow_conversion($input, DATA_TYPECODE, &is_new_object); if (!array || !require_dimensions(array, 4) || !require_size(array, size, 4) || !require_fortran(array)) SWIG_fail; |