Skip to content

Remove mode and size checks from C transpose methods #9962

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
radarhere wants to merge 1 commit into
base: main
Choose a base branch
from
+21 −84
Open

Remove mode and size checks from C transpose methods #9962

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/_imaging.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2175,25 +2175,25 @@ _transpose(ImagingObject *self, PyObject *args) {
if (imOut) {
switch (op) {
case 0:
(void)ImagingFlipLeftRight(imOut, imIn);
ImagingFlipLeftRight(imOut, imIn);
break;
case 1:
(void)ImagingFlipTopBottom(imOut, imIn);
ImagingFlipTopBottom(imOut, imIn);
break;
case 2:
(void)ImagingRotate90(imOut, imIn);
ImagingRotate90(imOut, imIn);
break;
case 3:
(void)ImagingRotate180(imOut, imIn);
ImagingRotate180(imOut, imIn);
break;
case 4:
(void)ImagingRotate270(imOut, imIn);
ImagingRotate270(imOut, imIn);
break;
case 5:
(void)ImagingTranspose(imOut, imIn);
ImagingTranspose(imOut, imIn);
break;
case 6:
(void)ImagingTransverse(imOut, imIn);
ImagingTransverse(imOut, imIn);
break;
}
}
Expand Down
77 changes: 7 additions & 70 deletions src/libImaging/Geometry.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,11 @@
/* -------------------------------------------------------------------- */
/* Transpose operations */

Imaging
void
ImagingFlipLeftRight(Imaging imOut, Imaging imIn) {
ImagingSectionCookie cookie;
int x, y, xr;

if (!imOut || !imIn || imIn->mode != imOut->mode) {
return (Imaging)ImagingError_ModeError();
}
if (imIn->xsize != imOut->xsize || imIn->ysize != imOut->ysize) {
return (Imaging)ImagingError_Mismatch();
}

ImagingCopyPalette(imOut, imIn);

#define FLIP_LEFT_RIGHT(INT, image) \
Expand Down Expand Up @@ -53,22 +46,13 @@ ImagingFlipLeftRight(Imaging imOut, Imaging imIn) {
ImagingSectionLeave(&cookie);

#undef FLIP_LEFT_RIGHT

return imOut;
}

Imaging
void
ImagingFlipTopBottom(Imaging imOut, Imaging imIn) {
ImagingSectionCookie cookie;
int y, yr;

if (!imOut || !imIn || imIn->mode != imOut->mode) {
return (Imaging)ImagingError_ModeError();
}
if (imIn->xsize != imOut->xsize || imIn->ysize != imOut->ysize) {
return (Imaging)ImagingError_Mismatch();
}

ImagingCopyPalette(imOut, imIn);

ImagingSectionEnter(&cookie);
Expand All @@ -79,23 +63,14 @@ ImagingFlipTopBottom(Imaging imOut, Imaging imIn) {
}

ImagingSectionLeave(&cookie);

return imOut;
}

Imaging
void
ImagingRotate90(Imaging imOut, Imaging imIn) {
ImagingSectionCookie cookie;
int x, y, xx, yy, xr, xxsize, yysize;
int xxx, yyy, xxxsize, yyysize;

if (!imOut || !imIn || imIn->mode != imOut->mode) {
return (Imaging)ImagingError_ModeError();
}
if (imIn->xsize != imOut->ysize || imIn->ysize != imOut->xsize) {
return (Imaging)ImagingError_Mismatch();
}

ImagingCopyPalette(imOut, imIn);

#define ROTATE_90(INT, image) \
Expand Down Expand Up @@ -139,23 +114,14 @@ ImagingRotate90(Imaging imOut, Imaging imIn) {
ImagingSectionLeave(&cookie);

#undef ROTATE_90

return imOut;
}

Imaging
void
ImagingTranspose(Imaging imOut, Imaging imIn) {
ImagingSectionCookie cookie;
int x, y, xx, yy, xxsize, yysize;
int xxx, yyy, xxxsize, yyysize;

if (!imOut || !imIn || imIn->mode != imOut->mode) {
return (Imaging)ImagingError_ModeError();
}
if (imIn->xsize != imOut->ysize || imIn->ysize != imOut->xsize) {
return (Imaging)ImagingError_Mismatch();
}

ImagingCopyPalette(imOut, imIn);

#define TRANSPOSE(INT, image) \
Expand Down Expand Up @@ -198,23 +164,14 @@ ImagingTranspose(Imaging imOut, Imaging imIn) {
ImagingSectionLeave(&cookie);

#undef TRANSPOSE

return imOut;
}

Imaging
void
ImagingTransverse(Imaging imOut, Imaging imIn) {
ImagingSectionCookie cookie;
int x, y, xr, yr, xx, yy, xxsize, yysize;
int xxx, yyy, xxxsize, yyysize;

if (!imOut || !imIn || imIn->mode != imOut->mode) {
return (Imaging)ImagingError_ModeError();
}
if (imIn->xsize != imOut->ysize || imIn->ysize != imOut->xsize) {
return (Imaging)ImagingError_Mismatch();
}

ImagingCopyPalette(imOut, imIn);

#define TRANSVERSE(INT, image) \
Expand Down Expand Up @@ -259,22 +216,13 @@ ImagingTransverse(Imaging imOut, Imaging imIn) {
ImagingSectionLeave(&cookie);

#undef TRANSVERSE

return imOut;
}

Imaging
void
ImagingRotate180(Imaging imOut, Imaging imIn) {
ImagingSectionCookie cookie;
int x, y, xr, yr;

if (!imOut || !imIn || imIn->mode != imOut->mode) {
return (Imaging)ImagingError_ModeError();
}
if (imIn->xsize != imOut->xsize || imIn->ysize != imOut->ysize) {
return (Imaging)ImagingError_Mismatch();
}

ImagingCopyPalette(imOut, imIn);

#define ROTATE_180(INT, image) \
Expand Down Expand Up @@ -303,23 +251,14 @@ ImagingRotate180(Imaging imOut, Imaging imIn) {
ImagingSectionLeave(&cookie);

#undef ROTATE_180

return imOut;
}

Imaging
void
ImagingRotate270(Imaging imOut, Imaging imIn) {
ImagingSectionCookie cookie;
int x, y, xx, yy, yr, xxsize, yysize;
int xxx, yyy, xxxsize, yyysize;

if (!imOut || !imIn || imIn->mode != imOut->mode) {
return (Imaging)ImagingError_ModeError();
}
if (imIn->xsize != imOut->ysize || imIn->ysize != imOut->xsize) {
return (Imaging)ImagingError_Mismatch();
}

ImagingCopyPalette(imOut, imIn);

#define ROTATE_270(INT, image) \
Expand Down Expand Up @@ -363,8 +302,6 @@ ImagingRotate270(Imaging imOut, Imaging imIn) {
ImagingSectionLeave(&cookie);

#undef ROTATE_270

return imOut;
}

/* -------------------------------------------------------------------- */
Expand Down
14 changes: 7 additions & 7 deletions src/libImaging/Imaging.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,9 +330,9 @@ extern Imaging
ImagingFillRadialGradient(ModeID mode);
extern Imaging
ImagingFilter(Imaging im, int xsize, int ysize, const FLOAT32 *kernel, FLOAT32 offset);
extern Imaging
extern void
ImagingFlipLeftRight(Imaging imOut, Imaging imIn);
extern Imaging
extern void
ImagingFlipTopBottom(Imaging imOut, Imaging imIn);
extern Imaging
ImagingGaussianBlur(
Expand Down Expand Up @@ -375,15 +375,15 @@ extern Imaging
ImagingPutBand(Imaging im, Imaging imIn, int band);
extern Imaging
ImagingRankFilter(Imaging im, int size, int rank);
extern Imaging
extern void
ImagingRotate90(Imaging imOut, Imaging imIn);
extern Imaging
extern void
ImagingRotate180(Imaging imOut, Imaging imIn);
extern Imaging
extern void
ImagingRotate270(Imaging imOut, Imaging imIn);
extern Imaging
extern void
ImagingTranspose(Imaging imOut, Imaging imIn);
extern Imaging
extern void
ImagingTransverse(Imaging imOut, Imaging imIn);
extern Imaging
ImagingResample(Imaging imIn, int xsize, int ysize, int filter, float box[4]);
Expand Down
Loading