python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-01-13 18:56:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

Changed PyString_* to PyBytes_*, corrected a couple of minor warnings

Browse Source
This commit is contained in:
wiredfool 2013-03-12 22:16:33 -07:00
parent a3b4697965
commit 5dd7953cf7
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
encode.c
View File

@ -672,7 +672,7 @@ PyImaging_LibTiffEncoderNew(PyObject* self, PyObject* args)
PyObject *dir; PyObject *dir;
PyObject *key, *value; PyObject *key, *value;
Py_ssize_t pos = 0; int pos = 0;
int status; int status;
if (! PyArg_ParseTuple(args, "sssisO", &mode, &rawmode, &compname, &fp, &filename, &dir)) { if (! PyArg_ParseTuple(args, "sssisO", &mode, &rawmode, &compname, &fp, &filename, &dir)) {
@ -707,6 +707,8 @@ PyImaging_LibTiffEncoderNew(PyObject* self, PyObject* args)
return NULL; return NULL;
} }
TRACE(("Found compression: %d\n", compression));
encoder = PyImaging_EncoderNew(sizeof(TIFFSTATE)); encoder = PyImaging_EncoderNew(sizeof(TIFFSTATE));
if (encoder == NULL) if (encoder == NULL)
return NULL; return NULL;
@ -727,11 +729,11 @@ PyImaging_LibTiffEncoderNew(PyObject* self, PyObject* args)
status = ImagingLibTiffSetField(&encoder->state, status = ImagingLibTiffSetField(&encoder->state,
(ttag_t) PyInt_AsLong(key), (ttag_t) PyInt_AsLong(key),
PyInt_AsLong(value)); PyInt_AsLong(value));
} else if(PyString_Check(value)) { } else if(PyBytes_Check(value)) {
TRACE(("Setting from String: %d, %s \n", (int)PyInt_AsLong(key),PyString_AsString(value))); TRACE(("Setting from String: %d, %s \n", (int)PyInt_AsLong(key),PyBytes_AsString(value)));
status = ImagingLibTiffSetField(&encoder->state, status = ImagingLibTiffSetField(&encoder->state,
(ttag_t) PyInt_AsLong(key), (ttag_t) PyInt_AsLong(key),
PyString_AsString(value)); PyBytes_AsString(value));
} else if(PyList_Check(value)) { } else if(PyList_Check(value)) {
int len,i; int len,i;
@ -757,7 +759,7 @@ PyImaging_LibTiffEncoderNew(PyObject* self, PyObject* args)
} else { } else {
TRACE(("Unhandled type for key %d : %s ", TRACE(("Unhandled type for key %d : %s ",
(int)PyInt_AsLong(key), (int)PyInt_AsLong(key),
PyString_AsString(PyObject_Str(value)))); PyBytes_AsString(PyObject_Str(value))));
} }
if (!status) { if (!status) {
TRACE(("Error setting Field\n")); TRACE(("Error setting Field\n"));