diff options
| author | Adam Reeve <aree035@aucklanduni.ac.nz> | 2014-06-16 10:12:16 +1200 |
|---|---|---|
| committer | Adam Reeve <aree035@aucklanduni.ac.nz> | 2014-06-16 10:19:50 +1200 |
| commit | 71fc8028beec5350b30f2f7638515ae1a8f88a7d (patch) | |
| tree | 0f178ae8fda827805e3f1883d21baa7035123534 /tools/swig | |
| parent | 89d9add9ff1f46ee0e0c7c4e106500d13c833bde (diff) | |
| download | numpy-71fc8028beec5350b30f2f7638515ae1a8f88a7d.tar.gz | |
Fix typemap for Fortran ordered array input
The typemaps with size parameters after the array pointer were correct,
but the typemaps with size parameters before the array pointer created
arrays with C ordering.
Diffstat (limited to 'tools/swig')
| -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; |