diff options
| author | Daniel <muellner@localhost.localdomain> | 2013-07-01 11:22:30 -0700 |
|---|---|---|
| committer | Daniel <muellner@localhost.localdomain> | 2013-07-01 11:22:30 -0700 |
| commit | cb7c7be71f32b2f04ed76fb5ad0c1116605d3636 (patch) | |
| tree | 4367092adc765c23166ed435175bd2d7f7705f95 /doc/source/reference/c-api.array.rst | |
| parent | 29dcc540610d1bd879ad02596791b4b11990090a (diff) | |
| download | numpy-cb7c7be71f32b2f04ed76fb5ad0c1116605d3636.tar.gz | |
Corrected typos in documentation for PyArray_GETPTR1.
Diffstat (limited to 'doc/source/reference/c-api.array.rst')
| -rw-r--r-- | doc/source/reference/c-api.array.rst | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/doc/source/reference/c-api.array.rst b/doc/source/reference/c-api.array.rst index 8b918f9dd..cef400fad 100644 --- a/doc/source/reference/c-api.array.rst +++ b/doc/source/reference/c-api.array.rst @@ -165,13 +165,13 @@ with misaligned data. at least *aobj* ->nd in size). You may want to typecast the returned pointer to the data type of the ndarray. -.. cfunction:: void* PyArray_GETPTR1(PyObject* obj, <npy_intp> i) +.. cfunction:: void* PyArray_GETPTR1(PyArrayObject* obj, npy_intp i) -.. cfunction:: void* PyArray_GETPTR2(PyObject* obj, <npy_intp> i, <npy_intp> j) +.. cfunction:: void* PyArray_GETPTR2(PyArrayObject* obj, npy_intp i, npy_intp j) -.. cfunction:: void* PyArray_GETPTR3(PyObject* obj, <npy_intp> i, <npy_intp> j, <npy_intp> k) +.. cfunction:: void* PyArray_GETPTR3(PyArrayObject* obj, npy_intp i, npy_intp j, npy_intp k) -.. cfunction:: void* PyArray_GETPTR4(PyObject* obj, <npy_intp> i, <npy_intp> j, <npy_intp> k, <npy_intp> l) +.. cfunction:: void* PyArray_GETPTR4(PyArrayObject* obj, npy_intp i, npy_intp j, npy_intp k, npy_intp l) Quick, inline access to the element at the given coordinates in the ndarray, *obj*, which must have respectively 1, 2, 3, or 4 @@ -1062,7 +1062,7 @@ Converting data types *arr* is an array scalar (has 0 dimensions), it finds the data type of smallest size to which the value may be converted without overflow or truncation to an integer. - + This function will not demote complex to float or anything to boolean, but will demote a signed integer to an unsigned integer when the scalar value is positive. @@ -1088,7 +1088,7 @@ Converting data types Categories are determined by first checking which of boolean, integer (int/uint), or floating point (float/complex) the maximum kind of all the arrays and the scalars are. - + If there are only scalars or the maximum category of the scalars is higher than the maximum category of the arrays, the data types are combined with :cfunc:`PyArray_PromoteTypes` @@ -1312,7 +1312,7 @@ of the constant names is deprecated in 1.7. .. note:: - Arrays can be both C-style and Fortran-style contiguous simultaneously. + Arrays can be both C-style and Fortran-style contiguous simultaneously. This is clear for 1-dimensional arrays, but can also be true for higher dimensional arrays. |