mirror of https://github.com/python/cpython
Issue #4822: fix messy indentation in memoryobject.c/.h, before we may backport it to trunk.
Reviewed on IRC by Georg Brandl, with assistance by Benjamin Peterson.
This commit is contained in:
parent
771ed76102
commit
35b7e837ab
|
@ -20,53 +20,53 @@ PyAPI_FUNC(PyObject *) PyMemoryView_GetContiguous(PyObject *base,
|
||||||
int buffertype,
|
int buffertype,
|
||||||
char fort);
|
char fort);
|
||||||
|
|
||||||
/* Return a contiguous chunk of memory representing the buffer
|
/* Return a contiguous chunk of memory representing the buffer
|
||||||
from an object in a memory view object. If a copy is made then the
|
from an object in a memory view object. If a copy is made then the
|
||||||
base object for the memory view will be a *new* bytes object.
|
base object for the memory view will be a *new* bytes object.
|
||||||
|
|
||||||
Otherwise, the base-object will be the object itself and no
|
Otherwise, the base-object will be the object itself and no
|
||||||
data-copying will be done.
|
data-copying will be done.
|
||||||
|
|
||||||
The buffertype argument can be PyBUF_READ, PyBUF_WRITE,
|
The buffertype argument can be PyBUF_READ, PyBUF_WRITE,
|
||||||
PyBUF_SHADOW to determine whether the returned buffer
|
PyBUF_SHADOW to determine whether the returned buffer
|
||||||
should be READONLY, WRITABLE, or set to update the
|
should be READONLY, WRITABLE, or set to update the
|
||||||
original buffer if a copy must be made. If buffertype is
|
original buffer if a copy must be made. If buffertype is
|
||||||
PyBUF_WRITE and the buffer is not contiguous an error will
|
PyBUF_WRITE and the buffer is not contiguous an error will
|
||||||
be raised. In this circumstance, the user can use
|
be raised. In this circumstance, the user can use
|
||||||
PyBUF_SHADOW to ensure that a a writable temporary
|
PyBUF_SHADOW to ensure that a a writable temporary
|
||||||
contiguous buffer is returned. The contents of this
|
contiguous buffer is returned. The contents of this
|
||||||
contiguous buffer will be copied back into the original
|
contiguous buffer will be copied back into the original
|
||||||
object after the memoryview object is deleted as long as
|
object after the memoryview object is deleted as long as
|
||||||
the original object is writable and allows setting an
|
the original object is writable and allows setting an
|
||||||
exclusive write lock. If this is not allowed by the
|
exclusive write lock. If this is not allowed by the
|
||||||
original object, then a BufferError is raised.
|
original object, then a BufferError is raised.
|
||||||
|
|
||||||
If the object is multi-dimensional and if fortran is 'F',
|
If the object is multi-dimensional and if fortran is 'F',
|
||||||
the first dimension of the underlying array will vary the
|
the first dimension of the underlying array will vary the
|
||||||
fastest in the buffer. If fortran is 'C', then the last
|
fastest in the buffer. If fortran is 'C', then the last
|
||||||
dimension will vary the fastest (C-style contiguous). If
|
dimension will vary the fastest (C-style contiguous). If
|
||||||
fortran is 'A', then it does not matter and you will get
|
fortran is 'A', then it does not matter and you will get
|
||||||
whatever the object decides is more efficient.
|
whatever the object decides is more efficient.
|
||||||
|
|
||||||
A new reference is returned that must be DECREF'd when finished.
|
A new reference is returned that must be DECREF'd when finished.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
PyAPI_FUNC(PyObject *) PyMemoryView_FromObject(PyObject *base);
|
PyAPI_FUNC(PyObject *) PyMemoryView_FromObject(PyObject *base);
|
||||||
|
|
||||||
PyAPI_FUNC(PyObject *) PyMemoryView_FromBuffer(Py_buffer *info);
|
PyAPI_FUNC(PyObject *) PyMemoryView_FromBuffer(Py_buffer *info);
|
||||||
/* create new if bufptr is NULL
|
/* create new if bufptr is NULL
|
||||||
will be a new bytesobject in base */
|
will be a new bytesobject in base */
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/* The struct is declared here so that macros can work, but it shouldn't
|
/* The struct is declared here so that macros can work, but it shouldn't
|
||||||
be considered public. Don't access those fields directly, use the macros
|
be considered public. Don't access those fields directly, use the macros
|
||||||
and functions instead! */
|
and functions instead! */
|
||||||
typedef struct {
|
typedef struct {
|
||||||
PyObject_HEAD
|
PyObject_HEAD
|
||||||
PyObject *base;
|
PyObject *base;
|
||||||
Py_buffer view;
|
Py_buffer view;
|
||||||
} PyMemoryViewObject;
|
} PyMemoryViewObject;
|
||||||
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue