summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNathaniel J. Smith <njs@pobox.com>2012-05-19 09:49:27 +0100
committerNathaniel J. Smith <njs@pobox.com>2012-05-19 09:49:27 +0100
commit412c8a6ad055b7809e5a77e8d5f257c33e102284 (patch)
tree94bc1f878e3e4cfd981e786cc389a82636f85299 /doc
parentc247305a75a20e4e5d421e691d931d6cc98c39ce (diff)
parent6c883959588b29c5ac92ef2723d24a93db63d716 (diff)
downloadnumpy-412c8a6ad055b7809e5a77e8d5f257c33e102284.tar.gz
Merge branch 'master' into clean-up-diagonal
Diffstat (limited to 'doc')
-rw-r--r--doc/source/reference/c-api.array.rst4
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/source/reference/c-api.array.rst b/doc/source/reference/c-api.array.rst
index 89981a977..8eedc689a 100644
--- a/doc/source/reference/c-api.array.rst
+++ b/doc/source/reference/c-api.array.rst
@@ -224,6 +224,8 @@ From scratch
.. cfunction:: PyObject* PyArray_NewFromDescr(PyTypeObject* subtype, PyArray_Descr* descr, int nd, npy_intp* dims, npy_intp* strides, void* data, int flags, PyObject* obj)
+ This function steals a reference to *descr* if it is not NULL.
+
This is the main array creation function. Most new arrays are
created with this flexible function.
@@ -322,6 +324,8 @@ From scratch
.. cfunction:: PyObject* PyArray_SimpleNewFromDescr(int nd, npy_intp* dims, PyArray_Descr* descr)
+ This function steals a reference to *descr* if it is not NULL.
+
Create a new array with the provided data-type descriptor, *descr*
, of the shape deteremined by *nd* and *dims*.