python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-03-03 11:35:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1387 from radarhere/imaging

Browse Source 
Improved handling of getink color
This commit is contained in:
wiredfool 2015-09-09 21:43:32 +01:00
commit 43c5f2cd64
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Tests/test_image_quantize.py
View File

@ -28,6 +28,10 @@ class TestImageQuantize(PillowTestCase):
im.quantize()
self.assertRaises(Exception, lambda: im.quantize(method=0))
def test_quantize(self):
im = Image.open('Tests/images/caption_6_33_22.png')
im.convert('RGB').quantize().convert('RGB')
if __name__ == '__main__':
unittest.main()

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
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) {
case IMAGING_TYPE_UINT8:
/* unsigned integer */
if (im->bands == 1) {
/* unsigned integer, single layer */
r = PyInt_AsLong(color);
if (r == -1 && PyErr_Occurred())
if (rIsInt != 1)
return NULL;
ink[0] = CLIP(r);
ink[1] = ink[2] = ink[3] = 0;
@ -526,8 +544,7 @@ getink(PyObject* color, Imaging im, char* ink)
return ink;
case IMAGING_TYPE_INT32:
/* signed integer */
r = PyInt_AsLong(color);
if (r == -1 && PyErr_Occurred())
if (rIsInt != 1)
return NULL;
*(INT32*) ink = r;
return ink;
@ -540,8 +557,7 @@ getink(PyObject* color, Imaging im, char* ink)
return ink;
case IMAGING_TYPE_SPECIAL:
if (strncmp(im->mode, "I;16", 4) == 0) {
r = PyInt_AsLong(color);
if (r == -1 && PyErr_Occurred())
if (rIsInt != 1)
return NULL;
ink[0] = (UINT8) r;
ink[1] = (UINT8) (r >> 8);