Removed the handles_eof flag in the decoder, as there are no users of it

This commit is contained in:
wiredfool 2016-11-14 07:47:02 -08:00
parent 76d156bef0
commit 90760a5f30
2 changed files with 1 additions and 15 deletions

View File

@ -210,7 +210,7 @@ class ImageFile(Image.Image):
else: else:
raise IOError("image file is truncated") raise IOError("image file is truncated")
if not s and not decoder.handles_eof: # truncated jpeg if not s: # truncated jpeg
self.tile = [] self.tile = []
# JpegDecode needs to clean things up here either way # JpegDecode needs to clean things up here either way

View File

@ -52,7 +52,6 @@ typedef struct {
struct ImagingCodecStateInstance state; struct ImagingCodecStateInstance state;
Imaging im; Imaging im;
PyObject* lock; PyObject* lock;
int handles_eof;
int pulls_fd; int pulls_fd;
} ImagingDecoderObject; } ImagingDecoderObject;
@ -95,9 +94,6 @@ PyImaging_DecoderNew(int contextsize)
/* Initialize the cleanup function pointer */ /* Initialize the cleanup function pointer */
decoder->cleanup = NULL; decoder->cleanup = NULL;
/* Most decoders don't want to handle EOF themselves */
decoder->handles_eof = 0;
/* set if the decoder needs to pull data from the fd, instead of /* set if the decoder needs to pull data from the fd, instead of
having it pushed */ having it pushed */
decoder->pulls_fd = 0; decoder->pulls_fd = 0;
@ -239,12 +235,6 @@ _setfd(ImagingDecoderObject* decoder, PyObject* args)
} }
static PyObject *
_get_handles_eof(ImagingDecoderObject *decoder)
{
return PyBool_FromLong(decoder->handles_eof);
}
static PyObject * static PyObject *
_get_pulls_fd(ImagingDecoderObject *decoder) _get_pulls_fd(ImagingDecoderObject *decoder)
{ {
@ -260,9 +250,6 @@ static struct PyMethodDef methods[] = {
}; };
static struct PyGetSetDef getseters[] = { static struct PyGetSetDef getseters[] = {
{"handles_eof", (getter)_get_handles_eof, NULL,
"True if this decoder expects to handle EOF itself.",
NULL},
{"pulls_fd", (getter)_get_pulls_fd, NULL, {"pulls_fd", (getter)_get_pulls_fd, NULL,
"True if this decoder expects to pull from self.fd itself.", "True if this decoder expects to pull from self.fd itself.",
NULL}, NULL},
@ -918,7 +905,6 @@ PyImaging_Jpeg2KDecoderNew(PyObject* self, PyObject* args)
if (decoder == NULL) if (decoder == NULL)
return NULL; return NULL;
decoder->handles_eof = 1;
decoder->pulls_fd = 1; decoder->pulls_fd = 1;
decoder->decode = ImagingJpeg2KDecode; decoder->decode = ImagingJpeg2KDecode;
decoder->cleanup = ImagingJpeg2KDecodeCleanup; decoder->cleanup = ImagingJpeg2KDecodeCleanup;