diff options
| author | jspreston <j.sam.preston@gmail.com> | 2014-02-20 14:32:20 -0700 |
|---|---|---|
| committer | jspreston <j.sam.preston@gmail.com> | 2014-02-20 14:32:20 -0700 |
| commit | aa615ad086989a7fe3900dd6921e83ff5ab02814 (patch) | |
| tree | 1f80a3498c6574e2374e3a86fecdeefae6cc2585 | |
| parent | 34d7bee3d472e5b97c1ea7c8d7e8d9949a9ebc16 (diff) | |
| download | numpy-aa615ad086989a7fe3900dd6921e83ff5ab02814.tar.gz | |
numpy.i bugfix: fortran ordering check
for ARGOUTVIEWM?_FARRAY[34] typemaps, the included require_fortran check was inverted -- failing if the resulting array had fortran ordering, not if it did not. This modification inverts these checks.
| -rw-r--r-- | doc/swig/numpy.i | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/doc/swig/numpy.i b/doc/swig/numpy.i index f2714cc34..529725479 100644 --- a/doc/swig/numpy.i +++ b/doc/swig/numpy.i @@ -2246,7 +2246,7 @@ PyObject* obj = PyArray_SimpleNewFromData(3, dims, DATA_TYPECODE, (void*)(*$1)); PyArrayObject* array = (PyArrayObject*) obj; - if (!array || require_fortran(array)) SWIG_fail; + if (!array || !require_fortran(array)) SWIG_fail; $result = SWIG_Python_AppendOutput($result,obj); } @@ -2270,7 +2270,7 @@ PyObject* obj = PyArray_SimpleNewFromData(3, dims, DATA_TYPECODE, (void*)(*$4)); PyArrayObject* array = (PyArrayObject*) obj; - if (!array || require_fortran(array)) SWIG_fail; + if (!array || !require_fortran(array)) SWIG_fail; $result = SWIG_Python_AppendOutput($result,obj); } @@ -2345,7 +2345,7 @@ PyObject* obj = PyArray_SimpleNewFromData(4, dims, DATA_TYPECODE, (void*)(*$1)); PyArrayObject* array = (PyArrayObject*) obj; - if (!array || require_fortran(array)) SWIG_fail; + if (!array || !require_fortran(array)) SWIG_fail; $result = SWIG_Python_AppendOutput($result,obj); } @@ -2370,7 +2370,7 @@ PyObject* obj = PyArray_SimpleNewFromData(4, dims, DATA_TYPECODE, (void*)(*$5)); PyArrayObject* array = (PyArrayObject*) obj; - if (!array || require_fortran(array)) SWIG_fail; + if (!array || !require_fortran(array)) SWIG_fail; $result = SWIG_Python_AppendOutput($result,obj); } @@ -2680,7 +2680,7 @@ PyObject* obj = PyArray_SimpleNewFromData(3, dims, DATA_TYPECODE, (void*)(*$1)); PyArrayObject* array = (PyArrayObject*) obj; - if (!array || require_fortran(array)) SWIG_fail; + if (!array || !require_fortran(array)) SWIG_fail; %#ifdef SWIGPY_USE_CAPSULE PyObject* cap = PyCapsule_New((void*)(*$1), SWIGPY_CAPSULE_NAME, free_cap); @@ -2717,7 +2717,7 @@ PyObject* obj = PyArray_SimpleNewFromData(3, dims, DATA_TYPECODE, (void*)(*$4)); PyArrayObject* array = (PyArrayObject*) obj; - if (!array || require_fortran(array)) SWIG_fail; + if (!array || !require_fortran(array)) SWIG_fail; %#ifdef SWIGPY_USE_CAPSULE PyObject* cap = PyCapsule_New((void*)(*$1), SWIGPY_CAPSULE_NAME, free_cap); @@ -2831,7 +2831,7 @@ PyObject* obj = PyArray_SimpleNewFromData(4, dims, DATA_TYPECODE, (void*)(*$1)); PyArrayObject* array = (PyArrayObject*) obj; - if (!array || require_fortran(array)) SWIG_fail; + if (!array || !require_fortran(array)) SWIG_fail; %#ifdef SWIGPY_USE_CAPSULE PyObject* cap = PyCapsule_New((void*)(*$1), SWIGPY_CAPSULE_NAME, free_cap); @@ -2869,7 +2869,7 @@ PyObject* obj = PyArray_SimpleNewFromData(4, dims, DATA_TYPECODE, (void*)(*$5)); PyArrayObject* array = (PyArrayObject*) obj; - if (!array || require_fortran(array)) SWIG_fail; + if (!array || !require_fortran(array)) SWIG_fail; %#ifdef SWIGPY_USE_CAPSULE PyObject* cap = PyCapsule_New((void*)(*$1), SWIGPY_CAPSULE_NAME, free_cap); @@ -2983,7 +2983,7 @@ PyObject* obj = PyArray_SimpleNewFromData(4, dims, DATA_TYPECODE, (void*)(*$1)); PyArrayObject* array = (PyArrayObject*) obj; - if (!array || require_fortran(array)) SWIG_fail; + if (!array || !require_fortran(array)) SWIG_fail; %#ifdef SWIGPY_USE_CAPSULE PyObject* cap = PyCapsule_New((void*)(*$1), SWIGPY_CAPSULE_NAME, free_cap); @@ -3021,7 +3021,7 @@ PyObject* obj = PyArray_SimpleNewFromData(4, dims, DATA_TYPECODE, (void*)(*$5)); PyArrayObject* array = (PyArrayObject*) obj; - if (!array || require_fortran(array)) SWIG_fail; + if (!array || !require_fortran(array)) SWIG_fail; %#ifdef SWIGPY_USE_CAPSULE PyObject* cap = PyCapsule_New((void*)(*$1), SWIGPY_CAPSULE_NAME, free_cap); |