diff --git a/src/_imaging.c b/src/_imaging.c index 999b8a30d..9867fe571 100644 --- a/src/_imaging.c +++ b/src/_imaging.c @@ -684,24 +684,6 @@ getink(PyObject *color, Imaging im, char *ink) { } else if (!PyArg_ParseTuple(color, "iiL", &b, &g, &r)) { return NULL; } - if (im->mode == IMAGING_MODE_BGR_15) { - UINT16 v = ((((UINT16)r) << 7) & 0x7c00) + - ((((UINT16)g) << 2) & 0x03e0) + - ((((UINT16)b) >> 3) & 0x001f); - - ink[0] = (UINT8)v; - ink[1] = (UINT8)(v >> 8); - ink[2] = ink[3] = 0; - return ink; - } else if (im->mode == IMAGING_MODE_BGR_16) { - UINT16 v = ((((UINT16)r) << 8) & 0xf800) + - ((((UINT16)g) << 3) & 0x07e0) + - ((((UINT16)b) >> 3) & 0x001f); - ink[0] = (UINT8)v; - ink[1] = (UINT8)(v >> 8); - ink[2] = ink[3] = 0; - return ink; - } } } diff --git a/src/libImaging/Mode.c b/src/libImaging/Mode.c index 78ea5aa70..9a8558179 100644 --- a/src/libImaging/Mode.c +++ b/src/libImaging/Mode.c @@ -18,8 +18,6 @@ const ModeData MODES[] = { [IMAGING_MODE_RGBA] = {"RGBA"}, [IMAGING_MODE_RGBX] = {"RGBX"}, [IMAGING_MODE_RGBa] = {"RGBa"}, [IMAGING_MODE_YCbCr] = {"YCbCr"}, - [IMAGING_MODE_BGR_15] = {"BGR;15"}, [IMAGING_MODE_BGR_16] = {"BGR;16"}, - [IMAGING_MODE_I_16] = {"I;16"}, [IMAGING_MODE_I_16L] = {"I;16L"}, [IMAGING_MODE_I_16B] = {"I;16B"}, [IMAGING_MODE_I_16N] = {"I;16N"}, [IMAGING_MODE_I_32L] = {"I;32L"}, [IMAGING_MODE_I_32B] = {"I;32B"}, diff --git a/src/libImaging/Mode.h b/src/libImaging/Mode.h index b824becf6..a3eb3d86d 100644 --- a/src/libImaging/Mode.h +++ b/src/libImaging/Mode.h @@ -21,9 +21,6 @@ typedef enum { IMAGING_MODE_RGBa, IMAGING_MODE_YCbCr, - IMAGING_MODE_BGR_15, - IMAGING_MODE_BGR_16, - IMAGING_MODE_I_16, IMAGING_MODE_I_16L, IMAGING_MODE_I_16B, @@ -62,10 +59,6 @@ typedef enum { IMAGING_RAWMODE_RGBa, IMAGING_RAWMODE_YCbCr, - // BGR modes. - IMAGING_RAWMODE_BGR_15, - IMAGING_RAWMODE_BGR_16, - // I;* modes. IMAGING_RAWMODE_I_16, IMAGING_RAWMODE_I_16L, @@ -95,6 +88,8 @@ typedef enum { IMAGING_RAWMODE_BGRA_16L, IMAGING_RAWMODE_BGRX, IMAGING_RAWMODE_BGR_5, + IMAGING_RAWMODE_BGR_15, + IMAGING_RAWMODE_BGR_16, IMAGING_RAWMODE_BGRa, IMAGING_RAWMODE_BGXR, IMAGING_RAWMODE_B_16B,