Skip to content

Commit

Permalink
Merge 7b99dff into ad36932
Browse files Browse the repository at this point in the history
  • Loading branch information
radarhere committed Apr 22, 2018
2 parents ad36932 + 7b99dff commit 58fc9c4
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions src/_imaging.c
Expand Up @@ -406,11 +406,11 @@ getlist(PyObject* arg, Py_ssize_t* length, const char* wrong_length, int type)
// on this switch. And 3 fewer loops to copy/paste.
switch (type) {
case TYPE_UINT8:
itemp = PyInt_AsLong(op);
itemp = (int)PyInt_AsLong(op);
((UINT8*)list)[i] = CLIP8(itemp);
break;
case TYPE_INT32:
itemp = PyInt_AsLong(op);
itemp = (int)PyInt_AsLong(op);
((INT32*)list)[i] = itemp;
break;
case TYPE_FLOAT32:
Expand Down Expand Up @@ -506,7 +506,7 @@ getink(PyObject* color, Imaging im, char* ink)
#else
if (PyInt_Check(color) || PyLong_Check(color)) {
if (PyInt_Check(color))
r = PyInt_AS_LONG(color);
r = (int)PyInt_AS_LONG(color);
else
r = PyLong_AsLongLong(color);
#endif
Expand Down Expand Up @@ -1033,17 +1033,17 @@ _getxy(PyObject* xy, int* x, int *y)

value = PyTuple_GET_ITEM(xy, 0);
if (PyInt_Check(value))
*x = PyInt_AS_LONG(value);
*x = (int)PyInt_AS_LONG(value);
else if (PyFloat_Check(value))
*x = (int) PyFloat_AS_DOUBLE(value);
*x = (int)PyFloat_AS_DOUBLE(value);
else
goto badval;

value = PyTuple_GET_ITEM(xy, 1);
if (PyInt_Check(value))
*y = PyInt_AS_LONG(value);
*y = (int)PyInt_AS_LONG(value);
else if (PyFloat_Check(value))
*y = (int) PyFloat_AS_DOUBLE(value);
*y = (int)PyFloat_AS_DOUBLE(value);
else
goto badval;

Expand Down

0 comments on commit 58fc9c4

Please sign in to comment.