summaryrefslogtreecommitdiff
path: root/doc/source/reference/c-api.array.rst
diff options
context:
space:
mode:
authorMark Wiebe <mwiebe@enthought.com>2011-07-08 17:47:21 -0500
committerCharles Harris <charlesr.harris@gmail.com>2011-07-08 19:38:25 -0600
commit75a2c03a0836b9e094bfad4c02c643901d17c593 (patch)
treef6948db6d4d80f206cac955309db472617253087 /doc/source/reference/c-api.array.rst
parent5f03b1504bcbe31b611376b6651e0297db165bad (diff)
downloadnumpy-75a2c03a0836b9e094bfad4c02c643901d17c593.tar.gz
ENH: core: Add np.copyto, PyArray_MaskedMoveInto, PyArray_MaskedCopyInto
These functions expose masked copying routines, with and without handling of overlapping data. Also deprecated the np.putmask and PyArray_PutMask functions, because np.copyto supercedes their functionality. This will need to be discussed on the list during the pull request review.
Diffstat (limited to 'doc/source/reference/c-api.array.rst')
-rw-r--r--doc/source/reference/c-api.array.rst8
1 files changed, 8 insertions, 0 deletions
diff --git a/doc/source/reference/c-api.array.rst b/doc/source/reference/c-api.array.rst
index 02aa03ff0..51802c436 100644
--- a/doc/source/reference/c-api.array.rst
+++ b/doc/source/reference/c-api.array.rst
@@ -475,6 +475,10 @@ From other objects
indicates that the array should be aligned in the sense that the
strides are multiples of the element size.
+ In versions 1.6 and earlier of NumPy, the following flags
+ did not have the _ARRAY_ macro namespace in them. That form
+ of the constant names is deprecated in 1.7.
+
.. cvar:: NPY_ARRAY_NOTSWAPPED
Make sure the returned array has a data-type descriptor that is in
@@ -1210,6 +1214,10 @@ might not be writeable. It might be in Fortan-contiguous order. The
array flags are used to indicate what can be said about data
associated with an array.
+In versions 1.6 and earlier of NumPy, the following flags
+did not have the _ARRAY_ macro namespace in them. That form
+of the constant names is deprecated in 1.7.
+
.. cvar:: NPY_ARRAY_C_CONTIGUOUS
The data area is in C-style contiguous order (last index varies the