python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-12-26 18:06:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6988 from radarhere/memoryview

Browse Source
This commit is contained in:
Hugo van Kemenade 2023-03-11 22:42:09 +02:00 committed by GitHub
commit bfcea9d718
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Tests/test_imagewin.py
View File

@ -100,8 +100,11 @@ class TestImageWinDib:
# Act # Act
# Make one the same as the using tobytes()/frombytes() # Make one the same as the using tobytes()/frombytes()
test_buffer = dib1.tobytes() test_buffer = dib1.tobytes()
dib2.frombytes(test_buffer) for datatype in ("bytes", "memoryview"):
if datatype == "memoryview":
test_buffer = memoryview(test_buffer)
dib2.frombytes(test_buffer)
# Assert # Assert
# Confirm they're the same # Confirm they're the same
assert dib1.tobytes() == dib2.tobytes() assert dib1.tobytes() == dib2.tobytes()

11
src/display.c
View File

@ -195,20 +195,21 @@ _releasedc(ImagingDisplayObject *display, PyObject *args) {
static PyObject * static PyObject *
_frombytes(ImagingDisplayObject *display, PyObject *args) { _frombytes(ImagingDisplayObject *display, PyObject *args) {
char *ptr; Py_buffer buffer;
Py_ssize_t bytes;
if (!PyArg_ParseTuple(args, "y#:frombytes", &ptr, &bytes)) { if (!PyArg_ParseTuple(args, "y*:frombytes", &buffer)) {
return NULL; return NULL;
} }
if (display->dib->ysize * display->dib->linesize != bytes) { if (display->dib->ysize * display->dib->linesize != buffer.len) {
PyBuffer_Release(&buffer);
PyErr_SetString(PyExc_ValueError, "wrong size"); PyErr_SetString(PyExc_ValueError, "wrong size");
return NULL; return NULL;
} }
memcpy(display->dib->bits, ptr, bytes); memcpy(display->dib->bits, buffer.buf, buffer.len);
PyBuffer_Release(&buffer);
Py_INCREF(Py_None); Py_INCREF(Py_None);
return Py_None; return Py_None;
} }