From 3ba2ea71f5af034b0e073e962c5234d61a919b2e Mon Sep 17 00:00:00 2001 From: Yay295 Date: Mon, 28 Oct 2024 09:36:03 -0500 Subject: [PATCH] linter changes --- src/Tk/tkImaging.c | 6 ++-- src/_imaging.c | 7 +++-- src/decode.c | 22 +++++++++---- src/encode.c | 4 ++- src/libImaging/Convert.c | 17 +++++----- src/libImaging/Fill.c | 12 +++---- src/libImaging/GetBBox.c | 9 +++--- src/libImaging/Matrix.c | 7 ++--- src/libImaging/Mode.c | 63 +++++++++++++++---------------------- src/libImaging/Mode.h | 24 +++++++------- src/libImaging/Pack.c | 3 +- src/libImaging/Paste.c | 9 +++--- src/libImaging/Point.c | 4 +-- src/libImaging/TiffDecode.c | 28 ++++++++++++++--- src/libImaging/Unpack.c | 9 ++++-- 15 files changed, 119 insertions(+), 105 deletions(-) diff --git a/src/Tk/tkImaging.c b/src/Tk/tkImaging.c index 3e35f885f..834634bd7 100644 --- a/src/Tk/tkImaging.c +++ b/src/Tk/tkImaging.c @@ -124,10 +124,8 @@ PyImagingPhotoPut( if (im->mode == IMAGING_MODE_1 || im->mode == IMAGING_MODE_L) { block.pixelSize = 1; block.offset[0] = block.offset[1] = block.offset[2] = block.offset[3] = 0; - } else if ( - im->mode == IMAGING_MODE_RGB || im->mode == IMAGING_MODE_RGBA || - im->mode == IMAGING_MODE_RGBX || im->mode == IMAGING_MODE_RGBa - ) { + } else if (im->mode == IMAGING_MODE_RGB || im->mode == IMAGING_MODE_RGBA || + im->mode == IMAGING_MODE_RGBX || im->mode == IMAGING_MODE_RGBa) { block.pixelSize = 4; block.offset[0] = 0; block.offset[1] = 1; diff --git a/src/_imaging.c b/src/_imaging.c index 9dcf9de7b..ce65ab7ae 100644 --- a/src/_imaging.c +++ b/src/_imaging.c @@ -1720,7 +1720,9 @@ _quantize(ImagingObject *self, PyObject *args) { if (!self->image->xsize || !self->image->ysize) { /* no content; return an empty image */ - return PyImagingNew(ImagingNew(IMAGING_MODE_P, self->image->xsize, self->image->ysize)); + return PyImagingNew( + ImagingNew(IMAGING_MODE_P, self->image->xsize, self->image->ysize) + ); } return PyImagingNew(ImagingQuantize(self->image, colours, method, kmeans)); @@ -2004,7 +2006,8 @@ _reduce(ImagingObject *self, PyObject *args) { static int isRGB(const ModeID mode) { - return mode == IMAGING_MODE_RGB || mode == IMAGING_MODE_RGBA || mode == IMAGING_MODE_RGBX; + return mode == IMAGING_MODE_RGB || mode == IMAGING_MODE_RGBA || + mode == IMAGING_MODE_RGBX; } static PyObject * diff --git a/src/decode.c b/src/decode.c index a39babe53..85cd25bd5 100644 --- a/src/decode.c +++ b/src/decode.c @@ -293,7 +293,9 @@ static PyTypeObject ImagingDecoderType = { /* -------------------------------------------------------------------- */ int -get_unpacker(ImagingDecoderObject *decoder, const ModeID mode, const RawModeID rawmode) { +get_unpacker( + ImagingDecoderObject *decoder, const ModeID mode, const RawModeID rawmode +) { int bits; ImagingShuffler unpack; @@ -324,7 +326,9 @@ PyImaging_BitDecoderNew(PyObject *self, PyObject *args) { int fill = 0; int sign = 0; int ystep = 1; - if (!PyArg_ParseTuple(args, "s|iiiii", &mode_name, &bits, &pad, &fill, &sign, &ystep)) { + if (!PyArg_ParseTuple( + args, "s|iiiii", &mode_name, &bits, &pad, &fill, &sign, &ystep + )) { return NULL; } @@ -435,7 +439,9 @@ PyImaging_GifDecoderNew(PyObject *self, PyObject *args) { int bits = 8; int interlace = 0; int transparency = -1; - if (!PyArg_ParseTuple(args, "s|iii", &mode_name, &bits, &interlace, &transparency)) { + if (!PyArg_ParseTuple( + args, "s|iii", &mode_name, &bits, &interlace, &transparency + )) { return NULL; } @@ -508,7 +514,9 @@ PyImaging_LibTiffDecoderNew(PyObject *self, PyObject *args) { int fp; uint32_t ifdoffset; - if (!PyArg_ParseTuple(args, "sssiI", &mode_name, &rawmode_name, &compname, &fp, &ifdoffset)) { + if (!PyArg_ParseTuple( + args, "sssiI", &mode_name, &rawmode_name, &compname, &fp, &ifdoffset + )) { return NULL; } @@ -850,12 +858,14 @@ PyImaging_JpegDecoderNew(PyObject *self, PyObject *args) { ImagingDecoderObject *decoder; char *mode_name; - char *rawmode_name; /* what we want from the decoder */ + char *rawmode_name; /* what we want from the decoder */ char *jpegmode_name; /* what's in the file */ int scale = 1; int draft = 0; - if (!PyArg_ParseTuple(args, "ssz|ii", &mode_name, &rawmode_name, &jpegmode_name, &scale, &draft)) { + if (!PyArg_ParseTuple( + args, "ssz|ii", &mode_name, &rawmode_name, &jpegmode_name, &scale, &draft + )) { return NULL; } diff --git a/src/encode.c b/src/encode.c index 7b67c2942..3f4f4319b 100644 --- a/src/encode.c +++ b/src/encode.c @@ -412,7 +412,9 @@ PyImaging_GifEncoderNew(PyObject *self, PyObject *args) { char *rawmode_name; Py_ssize_t bits = 8; Py_ssize_t interlace = 0; - if (!PyArg_ParseTuple(args, "ss|nn", &mode_name, &rawmode_name, &bits, &interlace)) { + if (!PyArg_ParseTuple( + args, "ss|nn", &mode_name, &rawmode_name, &bits, &interlace + )) { return NULL; } diff --git a/src/libImaging/Convert.c b/src/libImaging/Convert.c index 2fabe2d6b..b8ad55603 100644 --- a/src/libImaging/Convert.c +++ b/src/libImaging/Convert.c @@ -1724,25 +1724,22 @@ ImagingConvertTransparent(Imaging imIn, const ModeID mode, int r, int g, int b) return (Imaging)ImagingError_ModeError(); } - if (imIn->mode == IMAGING_MODE_RGB && (mode == IMAGING_MODE_RGBA || mode == IMAGING_MODE_RGBa)) { + if (imIn->mode == IMAGING_MODE_RGB && + (mode == IMAGING_MODE_RGBA || mode == IMAGING_MODE_RGBa)) { convert = rgb2rgba; if (mode == IMAGING_MODE_RGBa) { premultiplied = 1; } - } else if (imIn->mode == IMAGING_MODE_RGB && (mode == IMAGING_MODE_LA || mode == IMAGING_MODE_La)) { + } else if (imIn->mode == IMAGING_MODE_RGB && + (mode == IMAGING_MODE_LA || mode == IMAGING_MODE_La)) { convert = rgb2la; source_transparency = 1; if (mode == IMAGING_MODE_La) { premultiplied = 1; } - } else if ((imIn->mode == IMAGING_MODE_1 || - imIn->mode == IMAGING_MODE_I || - imIn->mode == IMAGING_MODE_I_16 || - imIn->mode == IMAGING_MODE_L - ) && ( - mode == IMAGING_MODE_RGBA || - mode == IMAGING_MODE_LA - )) { + } else if ((imIn->mode == IMAGING_MODE_1 || imIn->mode == IMAGING_MODE_I || + imIn->mode == IMAGING_MODE_I_16 || imIn->mode == IMAGING_MODE_L) && + (mode == IMAGING_MODE_RGBA || mode == IMAGING_MODE_LA)) { if (imIn->mode == IMAGING_MODE_1) { convert = bit2rgb; } else if (imIn->mode == IMAGING_MODE_I) { diff --git a/src/libImaging/Fill.c b/src/libImaging/Fill.c index 783110bfe..a8dae87f4 100644 --- a/src/libImaging/Fill.c +++ b/src/libImaging/Fill.c @@ -72,10 +72,8 @@ ImagingFillLinearGradient(const ModeID mode) { Imaging im; int y; - if (mode != IMAGING_MODE_1 && mode != IMAGING_MODE_F && - mode != IMAGING_MODE_I && mode != IMAGING_MODE_L && - mode != IMAGING_MODE_P - ) { + if (mode != IMAGING_MODE_1 && mode != IMAGING_MODE_F && mode != IMAGING_MODE_I && + mode != IMAGING_MODE_L && mode != IMAGING_MODE_P) { return (Imaging)ImagingError_ModeError(); } @@ -110,10 +108,8 @@ ImagingFillRadialGradient(const ModeID mode) { int x, y; int d; - if (mode != IMAGING_MODE_1 && mode != IMAGING_MODE_F && - mode != IMAGING_MODE_I && mode != IMAGING_MODE_L && - mode != IMAGING_MODE_P - ) { + if (mode != IMAGING_MODE_1 && mode != IMAGING_MODE_F && mode != IMAGING_MODE_I && + mode != IMAGING_MODE_L && mode != IMAGING_MODE_P) { return (Imaging)ImagingError_ModeError(); } diff --git a/src/libImaging/GetBBox.c b/src/libImaging/GetBBox.c index 3719a9f15..f94cf2a0e 100644 --- a/src/libImaging/GetBBox.c +++ b/src/libImaging/GetBBox.c @@ -89,11 +89,10 @@ ImagingGetBBox(Imaging im, int bbox[4], int alpha_only) { INT32 mask = 0xffffffff; if (im->bands == 3) { ((UINT8 *)&mask)[3] = 0; - } else if (alpha_only && ( - im->mode == IMAGING_MODE_RGBa || im->mode == IMAGING_MODE_RGBA || - im->mode == IMAGING_MODE_La || im->mode == IMAGING_MODE_LA || - im->mode == IMAGING_MODE_PA - )) { + } else if (alpha_only && + (im->mode == IMAGING_MODE_RGBa || im->mode == IMAGING_MODE_RGBA || + im->mode == IMAGING_MODE_La || im->mode == IMAGING_MODE_LA || + im->mode == IMAGING_MODE_PA)) { #ifdef WORDS_BIGENDIAN mask = 0x000000ff; #else diff --git a/src/libImaging/Matrix.c b/src/libImaging/Matrix.c index 6bc9fbc1d..d28e04edf 100644 --- a/src/libImaging/Matrix.c +++ b/src/libImaging/Matrix.c @@ -46,11 +46,8 @@ ImagingConvertMatrix(Imaging im, const ModeID mode, float m[]) { } } ImagingSectionLeave(&cookie); - } else if ( - mode == IMAGING_MODE_HSV || - mode == IMAGING_MODE_LAB || - mode == IMAGING_MODE_RGB - ) { + } else if (mode == IMAGING_MODE_HSV || mode == IMAGING_MODE_LAB || + mode == IMAGING_MODE_RGB) { imOut = ImagingNewDirty(mode, im->xsize, im->ysize); if (!imOut) { return NULL; diff --git a/src/libImaging/Mode.c b/src/libImaging/Mode.c index 1ec24aae8..8222c585b 100644 --- a/src/libImaging/Mode.c +++ b/src/libImaging/Mode.c @@ -9,36 +9,25 @@ const ModeData MODES[] = { [IMAGING_MODE_UNKNOWN] = {""}, - [IMAGING_MODE_1] = {"1"}, - [IMAGING_MODE_CMYK] = {"CMYK"}, - [IMAGING_MODE_F] = {"F"}, - [IMAGING_MODE_HSV] = {"HSV"}, - [IMAGING_MODE_I] = {"I"}, - [IMAGING_MODE_L] = {"L"}, - [IMAGING_MODE_LA] = {"LA"}, - [IMAGING_MODE_LAB] = {"LAB"}, - [IMAGING_MODE_La] = {"La"}, - [IMAGING_MODE_P] = {"P"}, - [IMAGING_MODE_PA] = {"PA"}, - [IMAGING_MODE_RGB] = {"RGB"}, - [IMAGING_MODE_RGBA] = {"RGBA"}, - [IMAGING_MODE_RGBX] = {"RGBX"}, - [IMAGING_MODE_RGBa] = {"RGBa"}, - [IMAGING_MODE_YCbCr] = {"YCbCr"}, + [IMAGING_MODE_1] = {"1"}, [IMAGING_MODE_CMYK] = {"CMYK"}, + [IMAGING_MODE_F] = {"F"}, [IMAGING_MODE_HSV] = {"HSV"}, + [IMAGING_MODE_I] = {"I"}, [IMAGING_MODE_L] = {"L"}, + [IMAGING_MODE_LA] = {"LA"}, [IMAGING_MODE_LAB] = {"LAB"}, + [IMAGING_MODE_La] = {"La"}, [IMAGING_MODE_P] = {"P"}, + [IMAGING_MODE_PA] = {"PA"}, [IMAGING_MODE_RGB] = {"RGB"}, + [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_BGR_15] = {"BGR;15"}, [IMAGING_MODE_BGR_16] = {"BGR;16"}, [IMAGING_MODE_BGR_24] = {"BGR;24"}, - [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"}, + [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"}, }; -const ModeID findModeID(const char * const name) { +const ModeID +findModeID(const char *const name) { if (name == NULL) { return IMAGING_MODE_UNKNOWN; } @@ -48,21 +37,21 @@ const ModeID findModeID(const char * const name) { fprintf(stderr, "Mode ID %zu is not defined.\n", (size_t)i); } else #endif - if (strcmp(MODES[i].name, name) == 0) { + if (strcmp(MODES[i].name, name) == 0) { return (ModeID)i; } } return IMAGING_MODE_UNKNOWN; } -const ModeData * const getModeData(const ModeID id) { +const ModeData *const +getModeData(const ModeID id) { if (id < 0 || id > sizeof(MODES) / sizeof(*MODES)) { return &MODES[IMAGING_MODE_UNKNOWN]; } return &MODES[id]; } - const RawModeData RAWMODES[] = { [IMAGING_RAWMODE_UNKNOWN] = {""}, @@ -242,7 +231,8 @@ const RawModeData RAWMODES[] = { [IMAGING_RAWMODE_aRGB] = {"aRGB"}, }; -const RawModeID findRawModeID(const char * const name) { +const RawModeID +findRawModeID(const char *const name) { if (name == NULL) { return IMAGING_RAWMODE_UNKNOWN; } @@ -252,24 +242,23 @@ const RawModeID findRawModeID(const char * const name) { fprintf(stderr, "Rawmode ID %zu is not defined.\n", (size_t)i); } else #endif - if (strcmp(RAWMODES[i].name, name) == 0) { + if (strcmp(RAWMODES[i].name, name) == 0) { return (RawModeID)i; } } return IMAGING_RAWMODE_UNKNOWN; } -const RawModeData * const getRawModeData(const RawModeID id) { +const RawModeData *const +getRawModeData(const RawModeID id) { if (id < 0 || id > sizeof(RAWMODES) / sizeof(*RAWMODES)) { return &RAWMODES[IMAGING_RAWMODE_UNKNOWN]; } return &RAWMODES[id]; } - -int isModeI16(const ModeID mode) { - return mode == IMAGING_MODE_I_16 - || mode == IMAGING_MODE_I_16L - || mode == IMAGING_MODE_I_16B - || mode == IMAGING_MODE_I_16N; +int +isModeI16(const ModeID mode) { + return mode == IMAGING_MODE_I_16 || mode == IMAGING_MODE_I_16L || + mode == IMAGING_MODE_I_16B || mode == IMAGING_MODE_I_16N; } diff --git a/src/libImaging/Mode.h b/src/libImaging/Mode.h index e21ad941a..a20ad0cb6 100644 --- a/src/libImaging/Mode.h +++ b/src/libImaging/Mode.h @@ -1,7 +1,6 @@ #ifndef __MODE_H__ #define __MODE_H__ - typedef enum { IMAGING_MODE_UNKNOWN, @@ -35,12 +34,13 @@ typedef enum { } ModeID; typedef struct { - const char * const name; + const char *const name; } ModeData; -const ModeID findModeID(const char * const name); -const ModeData * const getModeData(const ModeID id); - +const ModeID +findModeID(const char *const name); +const ModeData *const +getModeData(const ModeID id); typedef enum { IMAGING_RAWMODE_UNKNOWN, @@ -226,13 +226,15 @@ typedef enum { } RawModeID; typedef struct { - const char * const name; + const char *const name; } RawModeData; -const RawModeID findRawModeID(const char * const name); -const RawModeData * const getRawModeData(const RawModeID id); +const RawModeID +findRawModeID(const char *const name); +const RawModeData *const +getRawModeData(const RawModeID id); +int +isModeI16(const ModeID mode); -int isModeI16(const ModeID mode); - -#endif // __MODE_H__ +#endif // __MODE_H__ diff --git a/src/libImaging/Pack.c b/src/libImaging/Pack.c index bb27d640f..8f21eab3a 100644 --- a/src/libImaging/Pack.c +++ b/src/libImaging/Pack.c @@ -653,7 +653,8 @@ static struct { {IMAGING_MODE_I_16B, IMAGING_RAWMODE_I_16B, 16, copy2}, {IMAGING_MODE_I_16L, IMAGING_RAWMODE_I_16L, 16, copy2}, {IMAGING_MODE_I_16N, IMAGING_RAWMODE_I_16N, 16, copy2}, - {IMAGING_MODE_I_16, IMAGING_RAWMODE_I_16N, 16, packI16N_I16}, // LibTiff native->image endian. + {IMAGING_MODE_I_16, IMAGING_RAWMODE_I_16N, 16, packI16N_I16 + }, // LibTiff native->image endian. {IMAGING_MODE_I_16L, IMAGING_RAWMODE_I_16N, 16, packI16N_I16}, {IMAGING_MODE_I_16B, IMAGING_RAWMODE_I_16N, 16, packI16N_I16B}, {IMAGING_MODE_BGR_15, IMAGING_RAWMODE_BGR_15, 16, copy2}, diff --git a/src/libImaging/Paste.c b/src/libImaging/Paste.c index 54dd270e6..d4b973abc 100644 --- a/src/libImaging/Paste.c +++ b/src/libImaging/Paste.c @@ -450,11 +450,10 @@ fill_mask_L( } } else { - int alpha_channel = imOut->mode == IMAGING_MODE_RGBa || - imOut->mode == IMAGING_MODE_RGBA || - imOut->mode == IMAGING_MODE_La || - imOut->mode == IMAGING_MODE_LA || - imOut->mode == IMAGING_MODE_PA; + int alpha_channel = + imOut->mode == IMAGING_MODE_RGBa || imOut->mode == IMAGING_MODE_RGBA || + imOut->mode == IMAGING_MODE_La || imOut->mode == IMAGING_MODE_LA || + imOut->mode == IMAGING_MODE_PA; for (y = 0; y < ysize; y++) { UINT8 *out = (UINT8 *)imOut->image[y + dy] + dx * pixelsize; UINT8 *mask = (UINT8 *)imMask->image[y + sy] + sx; diff --git a/src/libImaging/Point.c b/src/libImaging/Point.c index b4415203a..b78873e0c 100644 --- a/src/libImaging/Point.c +++ b/src/libImaging/Point.c @@ -209,8 +209,8 @@ ImagingPointTransform(Imaging imIn, double scale, double offset) { Imaging imOut; int x, y; - if (!imIn || (imIn->mode != IMAGING_MODE_I && - imIn->mode != IMAGING_MODE_I_16 && imIn->mode != IMAGING_MODE_F)) { + if (!imIn || (imIn->mode != IMAGING_MODE_I && imIn->mode != IMAGING_MODE_I_16 && + imIn->mode != IMAGING_MODE_F)) { return (Imaging)ImagingError_ModeError(); } diff --git a/src/libImaging/TiffDecode.c b/src/libImaging/TiffDecode.c index 5c4c42f66..fdbe1c1b3 100644 --- a/src/libImaging/TiffDecode.c +++ b/src/libImaging/TiffDecode.c @@ -246,10 +246,26 @@ _pickUnpackers( // We'll pick appropriate set of unpackers depending on planar_configuration // It does not matter if data is RGB(A), CMYK or LUV really, // we just copy it plane by plane - unpackers[0] = ImagingFindUnpacker(IMAGING_MODE_RGBA, bits_per_sample == 16 ? IMAGING_RAWMODE_R_16N : IMAGING_RAWMODE_R, NULL); - unpackers[1] = ImagingFindUnpacker(IMAGING_MODE_RGBA, bits_per_sample == 16 ? IMAGING_RAWMODE_G_16N : IMAGING_RAWMODE_G, NULL); - unpackers[2] = ImagingFindUnpacker(IMAGING_MODE_RGBA, bits_per_sample == 16 ? IMAGING_RAWMODE_B_16N : IMAGING_RAWMODE_B, NULL); - unpackers[3] = ImagingFindUnpacker(IMAGING_MODE_RGBA, bits_per_sample == 16 ? IMAGING_RAWMODE_A_16N : IMAGING_RAWMODE_A, NULL); + unpackers[0] = ImagingFindUnpacker( + IMAGING_MODE_RGBA, + bits_per_sample == 16 ? IMAGING_RAWMODE_R_16N : IMAGING_RAWMODE_R, + NULL + ); + unpackers[1] = ImagingFindUnpacker( + IMAGING_MODE_RGBA, + bits_per_sample == 16 ? IMAGING_RAWMODE_G_16N : IMAGING_RAWMODE_G, + NULL + ); + unpackers[2] = ImagingFindUnpacker( + IMAGING_MODE_RGBA, + bits_per_sample == 16 ? IMAGING_RAWMODE_B_16N : IMAGING_RAWMODE_B, + NULL + ); + unpackers[3] = ImagingFindUnpacker( + IMAGING_MODE_RGBA, + bits_per_sample == 16 ? IMAGING_RAWMODE_A_16N : IMAGING_RAWMODE_A, + NULL + ); return im->bands; } else { @@ -761,7 +777,9 @@ ImagingLibTiffDecode( if (extrasamples >= 1 && (sampleinfo[0] == EXTRASAMPLE_UNSPECIFIED || sampleinfo[0] == EXTRASAMPLE_ASSOCALPHA)) { - shuffle = ImagingFindUnpacker(IMAGING_MODE_RGBA, IMAGING_RAWMODE_RGBa, NULL); + shuffle = ImagingFindUnpacker( + IMAGING_MODE_RGBA, IMAGING_RAWMODE_RGBa, NULL + ); for (y = state->yoff; y < state->ysize; y++) { UINT8 *ptr = (UINT8 *)im->image[y + state->yoff] + diff --git a/src/libImaging/Unpack.c b/src/libImaging/Unpack.c index 812e1d0b2..cee5177fd 100644 --- a/src/libImaging/Unpack.c +++ b/src/libImaging/Unpack.c @@ -1840,13 +1840,16 @@ static struct { {IMAGING_MODE_I_16N, IMAGING_RAWMODE_I_16N, 16, copy2}, {IMAGING_MODE_I_16, IMAGING_RAWMODE_I_16B, 16, unpackI16B_I16}, - {IMAGING_MODE_I_16, IMAGING_RAWMODE_I_16N, 16, unpackI16N_I16}, // LibTiff native->image endian. - {IMAGING_MODE_I_16L, IMAGING_RAWMODE_I_16N, 16, unpackI16N_I16}, // LibTiff native->image endian. + {IMAGING_MODE_I_16, IMAGING_RAWMODE_I_16N, 16, unpackI16N_I16 + }, // LibTiff native->image endian. + {IMAGING_MODE_I_16L, IMAGING_RAWMODE_I_16N, 16, unpackI16N_I16 + }, // LibTiff native->image endian. {IMAGING_MODE_I_16B, IMAGING_RAWMODE_I_16N, 16, unpackI16N_I16B}, {IMAGING_MODE_I_16, IMAGING_RAWMODE_I_16R, 16, unpackI16R_I16}, - {IMAGING_MODE_I_16, IMAGING_RAWMODE_I_12, 12, unpackI12_I16} // 12 bit Tiffs stored in 16bits. + {IMAGING_MODE_I_16, IMAGING_RAWMODE_I_12, 12, unpackI12_I16 + } // 12 bit Tiffs stored in 16bits. }; ImagingShuffler