diff options
| author | Aaron Meurer <asmeurer@gmail.com> | 2021-06-14 14:07:18 -0600 |
|---|---|---|
| committer | Aaron Meurer <asmeurer@gmail.com> | 2021-06-14 14:07:18 -0600 |
| commit | 8c78b84968e580f24b3705378fb35705a434cdf1 (patch) | |
| tree | c9f82beeb5a2c3f0301f7984d4b6d19539c35d23 /numpy/f2py/src/fortranobject.c | |
| parent | 8bf3a4618f1de951c7a4ccdb8bc3e36825a1b744 (diff) | |
| parent | 75f852edf94a7293e7982ad516bee314d7187c2d (diff) | |
| download | numpy-8c78b84968e580f24b3705378fb35705a434cdf1.tar.gz | |
Merge branch 'main' into matrix_rank-doc-fix
Diffstat (limited to 'numpy/f2py/src/fortranobject.c')
| -rw-r--r-- | numpy/f2py/src/fortranobject.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/f2py/src/fortranobject.c b/numpy/f2py/src/fortranobject.c index 3275f90ad..b9ef18701 100644 --- a/numpy/f2py/src/fortranobject.c +++ b/numpy/f2py/src/fortranobject.c @@ -799,7 +799,7 @@ PyArrayObject* array_from_pyobj(const int type_num, && ARRAY_ISCOMPATIBLE(arr,type_num) && F2PY_CHECK_ALIGNMENT(arr, intent) ) { - if ((intent & F2PY_INTENT_C)?PyArray_ISCARRAY(arr):PyArray_ISFARRAY(arr)) { + if ((intent & F2PY_INTENT_C)?PyArray_ISCARRAY_RO(arr):PyArray_ISFARRAY_RO(arr)) { if ((intent & F2PY_INTENT_OUT)) { Py_INCREF(arr); } @@ -807,9 +807,9 @@ PyArrayObject* array_from_pyobj(const int type_num, return arr; } } - if (intent & F2PY_INTENT_INOUT) { strcpy(mess, "failed to initialize intent(inout) array"); + /* Must use PyArray_IS*ARRAY because intent(inout) requires writable input */ if ((intent & F2PY_INTENT_C) && !PyArray_ISCARRAY(arr)) strcat(mess, " -- input not contiguous"); if (!(intent & F2PY_INTENT_C) && !PyArray_ISFARRAY(arr)) |