Skip to content

Only pass one argument to C expand #9664

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
+32 −33
Open

Only pass one argument to C expand #9664

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
2 changes: 1 addition & 1 deletion src/PIL/ImageFilter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ def filter(self, image: _imaging.ImagingCore) -> _imaging.ImagingCore:
if image.mode == "P":
msg = "cannot filter palette images"
raise ValueError(msg)
image = image.expand(self.size // 2, self.size // 2)
image = image.expand(self.size // 2)
return image.rankfilter(self.size, self.rank)


Expand Down
6 changes: 3 additions & 3 deletions src/_imaging.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1092,12 +1092,12 @@ _crop(ImagingObject *self, PyObject *args) {

static PyObject *
_expand_image(ImagingObject *self, PyObject *args) {
int x, y;
if (!PyArg_ParseTuple(args, "ii", &x, &y)) {
int m;
if (!PyArg_ParseTuple(args, "i", &m)) {
return NULL;
}

return PyImagingNew(ImagingExpand(self->image, x, y));
return PyImagingNew(ImagingExpand(self->image, m));
}

static PyObject *
Expand Down
55 changes: 27 additions & 28 deletions src/libImaging/Filter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,47 +51,46 @@ clip32(float in) {
}

Imaging
ImagingExpand(Imaging imIn, int xmargin, int ymargin) {
ImagingExpand(Imaging imIn, int margin) {
Imaging imOut;
int x, y;
ImagingSectionCookie cookie;

if (xmargin < 0 && ymargin < 0) {
if (margin < 0) {
return (Imaging)ImagingError_ValueError("bad kernel size");
}

imOut = ImagingNewDirty(
imIn->mode, imIn->xsize + 2 * xmargin, imIn->ysize + 2 * ymargin
);
imOut =
ImagingNewDirty(imIn->mode, imIn->xsize + 2 * margin, imIn->ysize + 2 * margin);
if (!imOut) {
return NULL;
}

#define EXPAND_LINE(type, image, yin, yout) \
{ \
for (x = 0; x < xmargin; x++) { \
imOut->image[yout][x] = imIn->image[yin][0]; \
} \
for (x = 0; x < imIn->xsize; x++) { \
imOut->image[yout][x + xmargin] = imIn->image[yin][x]; \
} \
for (x = 0; x < xmargin; x++) { \
imOut->image[yout][xmargin + imIn->xsize + x] = \
imIn->image[yin][imIn->xsize - 1]; \
} \
#define EXPAND_LINE(type, image, yin, yout) \
{ \
for (x = 0; x < margin; x++) { \
imOut->image[yout][x] = imIn->image[yin][0]; \
} \
for (x = 0; x < imIn->xsize; x++) { \
imOut->image[yout][x + margin] = imIn->image[yin][x]; \
} \
for (x = 0; x < margin; x++) { \
imOut->image[yout][margin + imIn->xsize + x] = \
imIn->image[yin][imIn->xsize - 1]; \
} \
}

#define EXPAND(type, image) \
{ \
for (y = 0; y < ymargin; y++) { \
EXPAND_LINE(type, image, 0, y); \
} \
for (y = 0; y < imIn->ysize; y++) { \
EXPAND_LINE(type, image, y, y + ymargin); \
} \
for (y = 0; y < ymargin; y++) { \
EXPAND_LINE(type, image, imIn->ysize - 1, ymargin + imIn->ysize + y); \
} \
#define EXPAND(type, image) \
{ \
for (y = 0; y < margin; y++) { \
EXPAND_LINE(type, image, 0, y); \
} \
for (y = 0; y < imIn->ysize; y++) { \
EXPAND_LINE(type, image, y, y + margin); \
} \
for (y = 0; y < margin; y++) { \
EXPAND_LINE(type, image, imIn->ysize - 1, margin + imIn->ysize + y); \
} \
}

ImagingSectionEnter(&cookie);
Expand Down
2 changes: 1 addition & 1 deletion src/libImaging/Imaging.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ ImagingConvertTransparent(Imaging im, ModeID mode, int r, int g, int b);
extern Imaging
ImagingCrop(Imaging im, int x0, int y0, int x1, int y1);
extern Imaging
ImagingExpand(Imaging im, int x, int y);
ImagingExpand(Imaging im, int m);
extern Imaging
ImagingFill(Imaging im, const void *ink);
extern int
Expand Down
Loading