mirror of
https://github.com/python-pillow/Pillow.git
synced 2024-12-27 10:26:19 +03:00
looks like rebase issue
This commit is contained in:
parent
a926d2e16f
commit
84527c7591
18
decode.c
18
decode.c
|
@ -752,15 +752,6 @@ PyImaging_TgaRleDecoderNew(PyObject* self, PyObject* args)
|
|||
if (decoder == NULL)
|
||||
return NULL;
|
||||
|
||||
#if defined(JCS_EXTENSIONS)
|
||||
// libjpeg-turbo supports different output formats.
|
||||
// We are choosing Pillow's native format (3 color bytes + 1 padding)
|
||||
// to avoid extra conversion in Unpack.c.
|
||||
if (strcmp(rawmode, "RGB") == 0) {
|
||||
rawmode = "RGBX";
|
||||
}
|
||||
#endif
|
||||
|
||||
if (get_unpacker(decoder, mode, rawmode) < 0)
|
||||
return NULL;
|
||||
|
||||
|
@ -872,6 +863,15 @@ PyImaging_JpegDecoderNew(PyObject* self, PyObject* args)
|
|||
if (decoder == NULL)
|
||||
return NULL;
|
||||
|
||||
#if defined(JCS_EXTENSIONS)
|
||||
// libjpeg-turbo supports different output formats.
|
||||
// We are choosing Pillow's native format (3 color bytes + 1 padding)
|
||||
// to avoid extra conversion in Unpack.c.
|
||||
if (strcmp(rawmode, "RGB") == 0) {
|
||||
rawmode = "RGBX";
|
||||
}
|
||||
#endif
|
||||
|
||||
if (get_unpacker(decoder, mode, rawmode) < 0)
|
||||
return NULL;
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user