python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-07-27 00:19:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

use mode structs in Storage.c

Browse Source
This commit is contained in:
eyedav 2025-07-19 15:54:11 +02:00
parent 858b0b3805
commit e75a0a9c39
1 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/libImaging/Storage.c
View File

@ -42,7 +42,7 @@
*/ */
Imaging Imaging
ImagingNewPrologueSubtype(const char *mode, int xsize, int ysize, int size) { ImagingNewPrologueSubtype(const Mode *mode, int xsize, int ysize, int size) {
Imaging im; Imaging im;
/* linesize overflow check, roughly the current largest space req'd */ /* linesize overflow check, roughly the current largest space req'd */
@ -62,37 +62,37 @@ ImagingNewPrologueSubtype(const char *mode, int xsize, int ysize, int size) {
im->type = IMAGING_TYPE_UINT8; im->type = IMAGING_TYPE_UINT8;
strcpy(im->arrow_band_format, "C"); strcpy(im->arrow_band_format, "C");
if (strcmp(mode, "1") == 0) { if (mode == IMAGING_MODE_1) {
/* 1-bit images */ /* 1-bit images */
im->bands = im->pixelsize = 1; im->bands = im->pixelsize = 1;
im->linesize = xsize; im->linesize = xsize;
strcpy(im->band_names[0], "1"); strcpy(im->band_names[0], "1");
} else if (strcmp(mode, "P") == 0) { } else if (mode == IMAGING_MODE_P) {
/* 8-bit palette mapped images */ /* 8-bit palette mapped images */
im->bands = im->pixelsize = 1; im->bands = im->pixelsize = 1;
im->linesize = xsize; im->linesize = xsize;
im->palette = ImagingPaletteNew("RGB"); im->palette = ImagingPaletteNew(IMAGING_MODE_RGB);
strcpy(im->band_names[0], "P"); strcpy(im->band_names[0], "P");
} else if (strcmp(mode, "PA") == 0) { } else if (mode == IMAGING_MODE_PA) {
/* 8-bit palette with alpha */ /* 8-bit palette with alpha */
im->bands = 2; im->bands = 2;
im->pixelsize = 4; /* store in image32 memory */ im->pixelsize = 4; /* store in image32 memory */
im->linesize = xsize * 4; im->linesize = xsize * 4;
im->palette = ImagingPaletteNew("RGB"); im->palette = ImagingPaletteNew(IMAGING_MODE_RGB);
strcpy(im->band_names[0], "P"); strcpy(im->band_names[0], "P");
strcpy(im->band_names[1], "X"); strcpy(im->band_names[1], "X");
strcpy(im->band_names[2], "X"); strcpy(im->band_names[2], "X");
strcpy(im->band_names[3], "A"); strcpy(im->band_names[3], "A");
} else if (strcmp(mode, "L") == 0) { } else if (mode == IMAGING_MODE_L) {
/* 8-bit grayscale (luminance) images */ /* 8-bit grayscale (luminance) images */
im->bands = im->pixelsize = 1; im->bands = im->pixelsize = 1;
im->linesize = xsize; im->linesize = xsize;
strcpy(im->band_names[0], "L"); strcpy(im->band_names[0], "L");
} else if (strcmp(mode, "LA") == 0) { } else if (mode == IMAGING_MODE_LA) {
/* 8-bit grayscale (luminance) with alpha */ /* 8-bit grayscale (luminance) with alpha */
im->bands = 2; im->bands = 2;
im->pixelsize = 4; /* store in image32 memory */ im->pixelsize = 4; /* store in image32 memory */
@ -102,7 +102,7 @@ ImagingNewPrologueSubtype(const char *mode, int xsize, int ysize, int size) {
strcpy(im->band_names[2], "X"); strcpy(im->band_names[2], "X");
strcpy(im->band_names[3], "A"); strcpy(im->band_names[3], "A");
} else if (strcmp(mode, "La") == 0) { } else if (mode == IMAGING_MODE_La) {
/* 8-bit grayscale (luminance) with premultiplied alpha */ /* 8-bit grayscale (luminance) with premultiplied alpha */
im->bands = 2; im->bands = 2;
im->pixelsize = 4; /* store in image32 memory */ im->pixelsize = 4; /* store in image32 memory */
@ -112,7 +112,7 @@ ImagingNewPrologueSubtype(const char *mode, int xsize, int ysize, int size) {
strcpy(im->band_names[2], "X"); strcpy(im->band_names[2], "X");
strcpy(im->band_names[3], "a"); strcpy(im->band_names[3], "a");
} else if (strcmp(mode, "F") == 0) { } else if (mode == IMAGING_MODE_F) {
/* 32-bit floating point images */ /* 32-bit floating point images */
im->bands = 1; im->bands = 1;
im->pixelsize = 4; im->pixelsize = 4;
@ -121,7 +121,7 @@ ImagingNewPrologueSubtype(const char *mode, int xsize, int ysize, int size) {
strcpy(im->arrow_band_format, "f"); strcpy(im->arrow_band_format, "f");
strcpy(im->band_names[0], "F"); strcpy(im->band_names[0], "F");
} else if (strcmp(mode, "I") == 0) { } else if (mode == IMAGING_MODE_I) {
/* 32-bit integer images */ /* 32-bit integer images */
im->bands = 1; im->bands = 1;
im->pixelsize = 4; im->pixelsize = 4;
@ -130,8 +130,7 @@ ImagingNewPrologueSubtype(const char *mode, int xsize, int ysize, int size) {
strcpy(im->arrow_band_format, "i"); strcpy(im->arrow_band_format, "i");
strcpy(im->band_names[0], "I"); strcpy(im->band_names[0], "I");
} else if (strcmp(mode, "I;16") == 0 || strcmp(mode, "I;16L") == 0 || } else if (isModeI16(mode)) {
strcmp(mode, "I;16B") == 0 || strcmp(mode, "I;16N") == 0) {
/* EXPERIMENTAL */ /* EXPERIMENTAL */
/* 16-bit raw integer images */ /* 16-bit raw integer images */
im->bands = 1; im->bands = 1;
@ -141,7 +140,7 @@ ImagingNewPrologueSubtype(const char *mode, int xsize, int ysize, int size) {
strcpy(im->arrow_band_format, "s"); strcpy(im->arrow_band_format, "s");
strcpy(im->band_names[0], "I"); strcpy(im->band_names[0], "I");
} else if (strcmp(mode, "RGB") == 0) { } else if (mode == IMAGING_MODE_RGB) {
/* 24-bit true colour images */ /* 24-bit true colour images */
im->bands = 3; im->bands = 3;
im->pixelsize = 4; im->pixelsize = 4;
@ -151,7 +150,7 @@ ImagingNewPrologueSubtype(const char *mode, int xsize, int ysize, int size) {
strcpy(im->band_names[2], "B"); strcpy(im->band_names[2], "B");
strcpy(im->band_names[3], "X"); strcpy(im->band_names[3], "X");
} else if (strcmp(mode, "RGBX") == 0) { } else if (mode == IMAGING_MODE_RGBX) {
/* 32-bit true colour images with padding */ /* 32-bit true colour images with padding */
im->bands = im->pixelsize = 4; im->bands = im->pixelsize = 4;
im->linesize = xsize * 4; im->linesize = xsize * 4;
@ -160,7 +159,7 @@ ImagingNewPrologueSubtype(const char *mode, int xsize, int ysize, int size) {
strcpy(im->band_names[2], "B"); strcpy(im->band_names[2], "B");
strcpy(im->band_names[3], "X"); strcpy(im->band_names[3], "X");
} else if (strcmp(mode, "RGBA") == 0) { } else if (mode == IMAGING_MODE_RGBA) {
/* 32-bit true colour images with alpha */ /* 32-bit true colour images with alpha */
im->bands = im->pixelsize = 4; im->bands = im->pixelsize = 4;
im->linesize = xsize * 4; im->linesize = xsize * 4;
@ -169,7 +168,7 @@ ImagingNewPrologueSubtype(const char *mode, int xsize, int ysize, int size) {
strcpy(im->band_names[2], "B"); strcpy(im->band_names[2], "B");
strcpy(im->band_names[3], "A"); strcpy(im->band_names[3], "A");
} else if (strcmp(mode, "RGBa") == 0) { } else if (mode == IMAGING_MODE_RGBa) {
/* 32-bit true colour images with premultiplied alpha */ /* 32-bit true colour images with premultiplied alpha */
im->bands = im->pixelsize = 4; im->bands = im->pixelsize = 4;
im->linesize = xsize * 4; im->linesize = xsize * 4;
@ -178,7 +177,7 @@ ImagingNewPrologueSubtype(const char *mode, int xsize, int ysize, int size) {
strcpy(im->band_names[2], "B"); strcpy(im->band_names[2], "B");
strcpy(im->band_names[3], "a"); strcpy(im->band_names[3], "a");
} else if (strcmp(mode, "CMYK") == 0) { } else if (mode == IMAGING_MODE_CMYK) {
/* 32-bit colour separation */ /* 32-bit colour separation */
im->bands = im->pixelsize = 4; im->bands = im->pixelsize = 4;
im->linesize = xsize * 4; im->linesize = xsize * 4;
@ -187,7 +186,7 @@ ImagingNewPrologueSubtype(const char *mode, int xsize, int ysize, int size) {
strcpy(im->band_names[2], "Y"); strcpy(im->band_names[2], "Y");
strcpy(im->band_names[3], "K"); strcpy(im->band_names[3], "K");
} else if (strcmp(mode, "YCbCr") == 0) { } else if (mode == IMAGING_MODE_YCbCr) {
/* 24-bit video format */ /* 24-bit video format */
im->bands = 3; im->bands = 3;
im->pixelsize = 4; im->pixelsize = 4;
@ -197,7 +196,7 @@ ImagingNewPrologueSubtype(const char *mode, int xsize, int ysize, int size) {
strcpy(im->band_names[2], "Cr"); strcpy(im->band_names[2], "Cr");
strcpy(im->band_names[3], "X"); strcpy(im->band_names[3], "X");
} else if (strcmp(mode, "LAB") == 0) { } else if (mode == IMAGING_MODE_LAB) {
/* 24-bit color, luminance, + 2 color channels */ /* 24-bit color, luminance, + 2 color channels */
/* L is uint8, a,b are int8 */ /* L is uint8, a,b are int8 */
im->bands = 3; im->bands = 3;
@ -208,7 +207,7 @@ ImagingNewPrologueSubtype(const char *mode, int xsize, int ysize, int size) {
strcpy(im->band_names[2], "b"); strcpy(im->band_names[2], "b");
strcpy(im->band_names[3], "X"); strcpy(im->band_names[3], "X");
} else if (strcmp(mode, "HSV") == 0) { } else if (mode == IMAGING_MODE_HSV) {
/* 24-bit color, luminance, + 2 color channels */ /* 24-bit color, luminance, + 2 color channels */
/* L is uint8, a,b are int8 */ /* L is uint8, a,b are int8 */
im->bands = 3; im->bands = 3;
@ -225,7 +224,7 @@ ImagingNewPrologueSubtype(const char *mode, int xsize, int ysize, int size) {
} }
/* Setup image descriptor */ /* Setup image descriptor */
strcpy(im->mode, mode); im->mode = mode;
/* Pointer array (allocate at least one line, to avoid MemoryError /* Pointer array (allocate at least one line, to avoid MemoryError
exceptions on platforms where calloc(0, x) returns NULL) */ exceptions on platforms where calloc(0, x) returns NULL) */
@ -257,7 +256,7 @@ ImagingNewPrologueSubtype(const char *mode, int xsize, int ysize, int size) {
} }
Imaging Imaging
ImagingNewPrologue(const char *mode, int xsize, int ysize) { ImagingNewPrologue(const Mode *mode, int xsize, int ysize) {
return ImagingNewPrologueSubtype( return ImagingNewPrologueSubtype(
mode, xsize, ysize, sizeof(struct ImagingMemoryInstance) mode, xsize, ysize, sizeof(struct ImagingMemoryInstance)
); );
@ -594,7 +593,7 @@ ImagingBorrowArrow(
*/ */
Imaging Imaging
ImagingNewInternal(const char *mode, int xsize, int ysize, int dirty) { ImagingNewInternal(const Mode *mode, int xsize, int ysize, int dirty) {
Imaging im; Imaging im;
if (xsize < 0 || ysize < 0) { if (xsize < 0 || ysize < 0) {
@ -630,7 +629,7 @@ ImagingNewInternal(const char *mode, int xsize, int ysize, int dirty) {
} }
Imaging Imaging
ImagingNew(const char *mode, int xsize, int ysize) { ImagingNew(const Mode *mode, int xsize, int ysize) {
if (ImagingDefaultArena.use_block_allocator) { if (ImagingDefaultArena.use_block_allocator) {
return ImagingNewBlock(mode, xsize, ysize); return ImagingNewBlock(mode, xsize, ysize);
} }
@ -638,7 +637,7 @@ ImagingNew(const char *mode, int xsize, int ysize) {
} }
Imaging Imaging
ImagingNewDirty(const char *mode, int xsize, int ysize) { ImagingNewDirty(const Mode *mode, int xsize, int ysize) {
if (ImagingDefaultArena.use_block_allocator) { if (ImagingDefaultArena.use_block_allocator) {
return ImagingNewBlock(mode, xsize, ysize); return ImagingNewBlock(mode, xsize, ysize);
} }
@ -646,7 +645,7 @@ ImagingNewDirty(const char *mode, int xsize, int ysize) {
} }
Imaging Imaging
ImagingNewBlock(const char *mode, int xsize, int ysize) { ImagingNewBlock(const Mode *mode, int xsize, int ysize) {
Imaging im; Imaging im;
if (xsize < 0 || ysize < 0) { if (xsize < 0 || ysize < 0) {
@ -668,7 +667,7 @@ ImagingNewBlock(const char *mode, int xsize, int ysize) {
Imaging Imaging
ImagingNewArrow( ImagingNewArrow(
const char *mode, const Mode *mode,
int xsize, int xsize,
int ysize, int ysize,
PyObject *schema_capsule, PyObject *schema_capsule,
@ -741,12 +740,12 @@ ImagingNewArrow(
} }
Imaging Imaging
ImagingNew2Dirty(const char *mode, Imaging imOut, Imaging imIn) { ImagingNew2Dirty(const Mode *mode, Imaging imOut, Imaging imIn) {
/* allocate or validate output image */ /* allocate or validate output image */
if (imOut) { if (imOut) {
/* make sure images match */ /* make sure images match */
if (strcmp(imOut->mode, mode) != 0 || imOut->xsize != imIn->xsize || if (imOut->mode != mode || imOut->xsize != imIn->xsize ||
imOut->ysize != imIn->ysize) { imOut->ysize != imIn->ysize) {
return ImagingError_Mismatch(); return ImagingError_Mismatch();
} }