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

Improved handling of getink color

Browse Source
This commit is contained in:
Andrew Murray 2015-08-22 22:29:23 +10:00
parent e4f68d0658
commit 2d9f091a30
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
_imaging.c
View File

@ -480,13 +480,31 @@ getink(PyObject* color, Imaging im, char* ink)
/* fill ink buffer (four bytes) with something that can /* fill ink buffer (four bytes) with something that can
be cast to either UINT8 or INT32 */ be cast to either UINT8 or INT32 */
int rIsInt = 1;
if (im->type == IMAGING_TYPE_UINT8 ||
im->type == IMAGING_TYPE_INT32 ||
im->type == IMAGING_TYPE_SPECIAL) {
#if PY_VERSION_HEX >= 0x03000000
if (PyLong_Check(color)) {
r = (int) PyLong_AsLong(color);
#else
if (PyInt_Check(color) || PyLong_Check(color)) {
if (PyInt_Check(color))
r = PyInt_AS_LONG(color);
else
r = (int) PyLong_AsLong(color);
#endif
}
if (r == -1 && PyErr_Occurred())
rIsInt = 0;
}
switch (im->type) { switch (im->type) {
case IMAGING_TYPE_UINT8: case IMAGING_TYPE_UINT8:
/* unsigned integer */ /* unsigned integer */
if (im->bands == 1) { if (im->bands == 1) {
/* unsigned integer, single layer */ /* unsigned integer, single layer */
r = PyInt_AsLong(color); if (rIsInt != 1)
if (r == -1 && PyErr_Occurred())
return NULL; return NULL;
ink[0] = CLIP(r); ink[0] = CLIP(r);
ink[1] = ink[2] = ink[3] = 0; ink[1] = ink[2] = ink[3] = 0;
@ -526,8 +544,7 @@ getink(PyObject* color, Imaging im, char* ink)
return ink; return ink;
case IMAGING_TYPE_INT32: case IMAGING_TYPE_INT32:
/* signed integer */ /* signed integer */
r = PyInt_AsLong(color); if (rIsInt != 1)
if (r == -1 && PyErr_Occurred())
return NULL; return NULL;
*(INT32*) ink = r; *(INT32*) ink = r;
return ink; return ink;
@ -540,8 +557,7 @@ getink(PyObject* color, Imaging im, char* ink)
return ink; return ink;
case IMAGING_TYPE_SPECIAL: case IMAGING_TYPE_SPECIAL:
if (strncmp(im->mode, "I;16", 4) == 0) { if (strncmp(im->mode, "I;16", 4) == 0) {
r = PyInt_AsLong(color); if (rIsInt != 1)
if (r == -1 && PyErr_Occurred())
return NULL; return NULL;
ink[0] = (UINT8) r; ink[0] = (UINT8) r;
ink[1] = (UINT8) (r >> 8); ink[1] = (UINT8) (r >> 8);