Merge pull request #18422 from mshabunin:fix-python-limited

pull/18429/head
Alexander Alekhin 4 years ago
commit 00c61cf197
  1. 1
      modules/python/python3/CMakeLists.txt
  2. 2
      modules/python/src2/cv2.cpp

@ -7,6 +7,7 @@ if(PYTHON3_LIMITED_API
AND NOT PYTHON3_NUMPY_VERSION VERSION_LESS "1.15"
AND PYTHON3_NUMPY_VERSION VERSION_LESS "1.17"
)
message(WARNING "Current NUMPY version (${PYTHON3_NUMPY_VERSION}) is not compatible with LIMITED_API.")
set(PYTHON3_LIMITED_API OFF)
endif()

@ -1499,7 +1499,7 @@ convert_to_python_tuple(const std::tuple<Tp...>& cpp_tuple, PyObject* py_tuple)
if (!item)
return;
PyTuple_SET_ITEM(py_tuple, I, item);
PyTuple_SetItem(py_tuple, I, item);
convert_to_python_tuple<I + 1, Tp...>(cpp_tuple, py_tuple);
}

Loading…
Cancel
Save