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

Merge pull request #2070 from arjennienhuis/pyargparselonglong

Browse Source 
Fix PyArg_ParseTuple format in getink()
This commit is contained in:
wiredfool 2016-09-22 09:26:13 +01:00 committed by GitHub
commit 97ddacb29b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
_imaging.c
View File

@ -524,7 +524,7 @@ getink(PyObject* color, Imaging im, char* ink)
if (im->bands == 1) { if (im->bands == 1) {
/* unsigned integer, single layer */ /* unsigned integer, single layer */
if (rIsInt != 1) { if (rIsInt != 1) {
if (!PyArg_ParseTuple(color, "i", &r)) { if (!PyArg_ParseTuple(color, "L", &r)) {
return NULL; return NULL;
} }
} }
@ -540,11 +540,11 @@ getink(PyObject* color, Imaging im, char* ink)
r = (UINT8) r; r = (UINT8) r;
} else { } else {
if (im->bands == 2) { if (im->bands == 2) {
if (!PyArg_ParseTuple(color, "i|i", &r, &a)) if (!PyArg_ParseTuple(color, "L|i", &r, &a))
return NULL; return NULL;
g = b = r; g = b = r;
} else { } else {
if (!PyArg_ParseTuple(color, "iii|i", &r, &g, &b, &a)) if (!PyArg_ParseTuple(color, "Lii|i", &r, &g, &b, &a))
return NULL; return NULL;
} }
} }