pybind/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2026-05-27 08:26:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Incref descriptors properly when creating arrays

Browse Source
This commit is contained in:
Ivan Smirnov
2016-06-22 00:33:56 +01:00
parent 669e14269d
commit 2a7acb6d55
3 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/pybind11/numpy.h
View File

@@ -96,7 +96,7 @@ public:
template <typename Type> array(size_t size, const Type *ptr) {
API& api = lookup_api();
PyObject *descr = detail::npy_format_descriptor<Type>::descr();
PyObject *descr = object(detail::npy_format_descriptor<Type>::descr(), true).release().ptr();
Py_intptr_t shape = (Py_intptr_t) size;
object tmp = object(api.PyArray_NewFromDescr_(
api.PyArray_Type_, descr, 1, &shape, nullptr, (void *) ptr, 0, nullptr), false);
@@ -147,7 +147,7 @@ public:
if (ptr == nullptr)
return nullptr;
API &api = lookup_api();
PyObject *descr = detail::npy_format_descriptor<T>::descr();
PyObject *descr = object(detail::npy_format_descriptor<T>::descr(), true).release().ptr();
PyObject *result = api.PyArray_FromAny_(ptr, descr, 0, 0, API::NPY_ENSURE_ARRAY_ | ExtraFlags, nullptr);
if (!result)
PyErr_Clear();