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

use mode structs in Geometry.c

Browse Source
This commit is contained in:
Yay295 2024-10-12 21:10:41 -05:00
parent 90ea0609df
commit d8f9bfbbbe
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/libImaging/Geometry.c
View File

@ -19,7 +19,7 @@ ImagingFlipLeftRight(Imaging imOut, Imaging imIn) {
ImagingSectionCookie cookie; ImagingSectionCookie cookie;
int x, y, xr; int x, y, xr;
if (!imOut || !imIn || strcmp(imIn->mode, imOut->mode) != 0) { if (!imOut || !imIn || imIn->mode != imOut->mode) {
return (Imaging)ImagingError_ModeError(); return (Imaging)ImagingError_ModeError();
} }
if (imIn->xsize != imOut->xsize || imIn->ysize != imOut->ysize) { if (imIn->xsize != imOut->xsize || imIn->ysize != imOut->ysize) {
@ -41,7 +41,7 @@ ImagingFlipLeftRight(Imaging imOut, Imaging imIn) {
ImagingSectionEnter(&cookie); ImagingSectionEnter(&cookie);
if (imIn->image8) { if (imIn->image8) {
if (strncmp(imIn->mode, "I;16", 4) == 0) { if (strncmp(imIn->mode->name, "I;16", 4) == 0) {
FLIP_LEFT_RIGHT(UINT16, image8) FLIP_LEFT_RIGHT(UINT16, image8)
} else { } else {
FLIP_LEFT_RIGHT(UINT8, image8) FLIP_LEFT_RIGHT(UINT8, image8)
@ -62,7 +62,7 @@ ImagingFlipTopBottom(Imaging imOut, Imaging imIn) {
ImagingSectionCookie cookie; ImagingSectionCookie cookie;
int y, yr; int y, yr;
if (!imOut || !imIn || strcmp(imIn->mode, imOut->mode) != 0) { if (!imOut || !imIn || imIn->mode != imOut->mode) {
return (Imaging)ImagingError_ModeError(); return (Imaging)ImagingError_ModeError();
} }
if (imIn->xsize != imOut->xsize || imIn->ysize != imOut->ysize) { if (imIn->xsize != imOut->xsize || imIn->ysize != imOut->ysize) {
@ -89,7 +89,7 @@ ImagingRotate90(Imaging imOut, Imaging imIn) {
int x, y, xx, yy, xr, xxsize, yysize; int x, y, xx, yy, xr, xxsize, yysize;
int xxx, yyy, xxxsize, yyysize; int xxx, yyy, xxxsize, yyysize;
if (!imOut || !imIn || strcmp(imIn->mode, imOut->mode) != 0) { if (!imOut || !imIn || imIn->mode != imOut->mode) {
return (Imaging)ImagingError_ModeError(); return (Imaging)ImagingError_ModeError();
} }
if (imIn->xsize != imOut->ysize || imIn->ysize != imOut->xsize) { if (imIn->xsize != imOut->ysize || imIn->ysize != imOut->xsize) {
@ -127,7 +127,7 @@ ImagingRotate90(Imaging imOut, Imaging imIn) {
ImagingSectionEnter(&cookie); ImagingSectionEnter(&cookie);
if (imIn->image8) { if (imIn->image8) {
if (strncmp(imIn->mode, "I;16", 4) == 0) { if (strncmp(imIn->mode->name, "I;16", 4) == 0) {
ROTATE_90(UINT16, image8); ROTATE_90(UINT16, image8);
} else { } else {
ROTATE_90(UINT8, image8); ROTATE_90(UINT8, image8);
@ -149,7 +149,7 @@ ImagingTranspose(Imaging imOut, Imaging imIn) {
int x, y, xx, yy, xxsize, yysize; int x, y, xx, yy, xxsize, yysize;
int xxx, yyy, xxxsize, yyysize; int xxx, yyy, xxxsize, yyysize;
if (!imOut || !imIn || strcmp(imIn->mode, imOut->mode) != 0) { if (!imOut || !imIn || imIn->mode != imOut->mode) {
return (Imaging)ImagingError_ModeError(); return (Imaging)ImagingError_ModeError();
} }
if (imIn->xsize != imOut->ysize || imIn->ysize != imOut->xsize) { if (imIn->xsize != imOut->ysize || imIn->ysize != imOut->xsize) {
@ -186,7 +186,7 @@ ImagingTranspose(Imaging imOut, Imaging imIn) {
ImagingSectionEnter(&cookie); ImagingSectionEnter(&cookie);
if (imIn->image8) { if (imIn->image8) {
if (strncmp(imIn->mode, "I;16", 4) == 0) { if (strncmp(imIn->mode->name, "I;16", 4) == 0) {
TRANSPOSE(UINT16, image8); TRANSPOSE(UINT16, image8);
} else { } else {
TRANSPOSE(UINT8, image8); TRANSPOSE(UINT8, image8);
@ -208,7 +208,7 @@ ImagingTransverse(Imaging imOut, Imaging imIn) {
int x, y, xr, yr, xx, yy, xxsize, yysize; int x, y, xr, yr, xx, yy, xxsize, yysize;
int xxx, yyy, xxxsize, yyysize; int xxx, yyy, xxxsize, yyysize;
if (!imOut || !imIn || strcmp(imIn->mode, imOut->mode) != 0) { if (!imOut || !imIn || imIn->mode != imOut->mode) {
return (Imaging)ImagingError_ModeError(); return (Imaging)ImagingError_ModeError();
} }
if (imIn->xsize != imOut->ysize || imIn->ysize != imOut->xsize) { if (imIn->xsize != imOut->ysize || imIn->ysize != imOut->xsize) {
@ -247,7 +247,7 @@ ImagingTransverse(Imaging imOut, Imaging imIn) {
ImagingSectionEnter(&cookie); ImagingSectionEnter(&cookie);
if (imIn->image8) { if (imIn->image8) {
if (strncmp(imIn->mode, "I;16", 4) == 0) { if (strncmp(imIn->mode->name, "I;16", 4) == 0) {
TRANSVERSE(UINT16, image8); TRANSVERSE(UINT16, image8);
} else { } else {
TRANSVERSE(UINT8, image8); TRANSVERSE(UINT8, image8);
@ -268,7 +268,7 @@ ImagingRotate180(Imaging imOut, Imaging imIn) {
ImagingSectionCookie cookie; ImagingSectionCookie cookie;
int x, y, xr, yr; int x, y, xr, yr;
if (!imOut || !imIn || strcmp(imIn->mode, imOut->mode) != 0) { if (!imOut || !imIn || imIn->mode != imOut->mode) {
return (Imaging)ImagingError_ModeError(); return (Imaging)ImagingError_ModeError();
} }
if (imIn->xsize != imOut->xsize || imIn->ysize != imOut->ysize) { if (imIn->xsize != imOut->xsize || imIn->ysize != imOut->ysize) {
@ -291,7 +291,7 @@ ImagingRotate180(Imaging imOut, Imaging imIn) {
yr = imIn->ysize - 1; yr = imIn->ysize - 1;
if (imIn->image8) { if (imIn->image8) {
if (strncmp(imIn->mode, "I;16", 4) == 0) { if (strncmp(imIn->mode->name, "I;16", 4) == 0) {
ROTATE_180(UINT16, image8) ROTATE_180(UINT16, image8)
} else { } else {
ROTATE_180(UINT8, image8) ROTATE_180(UINT8, image8)
@ -313,7 +313,7 @@ ImagingRotate270(Imaging imOut, Imaging imIn) {
int x, y, xx, yy, yr, xxsize, yysize; int x, y, xx, yy, yr, xxsize, yysize;
int xxx, yyy, xxxsize, yyysize; int xxx, yyy, xxxsize, yyysize;
if (!imOut || !imIn || strcmp(imIn->mode, imOut->mode) != 0) { if (!imOut || !imIn || imIn->mode != imOut->mode) {
return (Imaging)ImagingError_ModeError(); return (Imaging)ImagingError_ModeError();
} }
if (imIn->xsize != imOut->ysize || imIn->ysize != imOut->xsize) { if (imIn->xsize != imOut->ysize || imIn->ysize != imOut->xsize) {
@ -351,7 +351,7 @@ ImagingRotate270(Imaging imOut, Imaging imIn) {
ImagingSectionEnter(&cookie); ImagingSectionEnter(&cookie);
if (imIn->image8) { if (imIn->image8) {
if (strncmp(imIn->mode, "I;16", 4) == 0) { if (strncmp(imIn->mode->name, "I;16", 4) == 0) {
ROTATE_270(UINT16, image8); ROTATE_270(UINT16, image8);
} else { } else {
ROTATE_270(UINT8, image8); ROTATE_270(UINT8, image8);
@ -791,7 +791,7 @@ ImagingGenericTransform(
char *out; char *out;
double xx, yy; double xx, yy;
if (!imOut || !imIn || strcmp(imIn->mode, imOut->mode) != 0) { if (!imOut || !imIn || imIn->mode != imOut->mode) {
return (Imaging)ImagingError_ModeError(); return (Imaging)ImagingError_ModeError();
} }
@ -848,7 +848,7 @@ ImagingScaleAffine(
int xmin, xmax; int xmin, xmax;
int *xintab; int *xintab;
if (!imOut || !imIn || strcmp(imIn->mode, imOut->mode) != 0) { if (!imOut || !imIn || imIn->mode != imOut->mode) {
return (Imaging)ImagingError_ModeError(); return (Imaging)ImagingError_ModeError();
} }
@ -1035,7 +1035,7 @@ ImagingTransformAffine(
double xx, yy; double xx, yy;
double xo, yo; double xo, yo;
if (!imOut || !imIn || strcmp(imIn->mode, imOut->mode) != 0) { if (!imOut || !imIn || imIn->mode != imOut->mode) {
return (Imaging)ImagingError_ModeError(); return (Imaging)ImagingError_ModeError();
} }