python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-12-28 02:46:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

looks like rebase issue

Browse Source
This commit is contained in:
homm 2016-10-12 23:54:08 +03:00
parent a926d2e16f
commit 84527c7591
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
decode.c
View File

@ -752,15 +752,6 @@ PyImaging_TgaRleDecoderNew(PyObject* self, PyObject* args)
if (decoder == NULL) if (decoder == NULL)
return 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) if (get_unpacker(decoder, mode, rawmode) < 0)
return NULL; return NULL;
@ -872,6 +863,15 @@ PyImaging_JpegDecoderNew(PyObject* self, PyObject* args)
if (decoder == NULL) if (decoder == NULL)
return 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) if (get_unpacker(decoder, mode, rawmode) < 0)
return NULL; return NULL;