Skip to content

Clean up and speed up RankFilter #10045

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
akx wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Clean up and speed up RankFilter #10045

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7de1bae
Make ImagingExpand work correctly for I16 images, apply hoist optimiz…
akx Sep 22, 2026
45da303
Clean up and speed up RankFilter
akx Sep 22, 2026
3655d38
Special-case min/max filters to not use quickselect
akx Sep 24, 2026
a84857d
Port median sort networks from http://ndevilla.free.fr/median/median/…
akx Sep 23, 2026
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
18 changes: 18 additions & 0 deletions Tests/test_image_filter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,24 @@ def test_rankfilter_overflow() -> None:
im.filter(rankfilter)


@pytest.mark.parametrize(
"mode, fill",
(
("L", 0x12),
("I", 0x12345678),
("I;16", 0x1234),
("I;16B", 0x1234),
("F", 1.5),
("RGB", (0x12, 0x34, 0x56)),
),
)
@pytest.mark.parametrize("margin", (0, 1, 3))
def test_expand(mode: str, fill: float | tuple[int, ...], margin: int) -> None:
im = Image.new(mode, (5, 4), fill)
out = im._new(im.im.expand(margin)) # As done internally by RankFilter
assert_image_equal(out, Image.new(mode, (5 + 2 * margin, 4 + 2 * margin), fill))


def test_builtinfilter_p() -> None:
builtin_filter = ImageFilter.BuiltinFilter()

Expand Down
4 changes: 2 additions & 2 deletions src/_imaging.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1756,7 +1756,7 @@ _putdata(ImagingObject *self, PyObject *args) {
for (i = x = y = 0; i < n; i++) {
double value;
set_value_to_item(seq, i);
IMAGING_PIXEL_INT32(image, x, y) = (INT32)(value * scale + offset);
image->image32[y][x] = (INT32)(value * scale + offset);
if (++x >= (int)image->xsize) {
x = 0, y++;
}
Expand All @@ -1766,7 +1766,7 @@ _putdata(ImagingObject *self, PyObject *args) {
for (i = x = y = 0; i < n; i++) {
double value;
set_value_to_item(seq, i);
IMAGING_PIXEL_FLOAT32(image, x, y) =
((FLOAT32 *)image->image32[y])[x] =
(FLOAT32)(value * scale + offset);
if (++x >= (int)image->xsize) {
x = 0, y++;
Expand Down
57 changes: 31 additions & 26 deletions src/libImaging/Filter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,38 +76,43 @@ ImagingExpand(Imaging imIn, int margin) {
return NULL;
}

#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]; \
} \
int xsize = imIn->xsize, ysize = imIn->ysize;

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

#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); \
} \
#define EXPAND(type) \
{ \
for (y = 0; y < margin; y++) { \
EXPAND_LINE(type, 0, y); \
} \
for (y = 0; y < ysize; y++) { \
EXPAND_LINE(type, y, y + margin); \
} \
for (y = 0; y < margin; y++) { \
EXPAND_LINE(type, ysize - 1, margin + ysize + y); \
} \
}

ImagingSectionEnter(&cookie);
if (imIn->image8) {
EXPAND(UINT8, image8);
if (imIn->type == IMAGING_TYPE_I16) {
EXPAND(UINT16);
} else if (imIn->image8) {
EXPAND(UINT8);
} else {
EXPAND(INT32, image32);
EXPAND(INT32);
}
ImagingSectionLeave(&cookie);

Expand Down
4 changes: 0 additions & 4 deletions src/libImaging/Imaging.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,6 @@ struct ImagingMemoryInstance {
#define IMAGING_PIXEL_CMYK(im, x, y) ((im)->image[(y)][(x) * 4])
#define IMAGING_PIXEL_YCbCr(im, x, y) ((im)->image[(y)][(x) * 4])

#define IMAGING_PIXEL_UINT8(im, x, y) ((im)->image8[(y)][(x)])
#define IMAGING_PIXEL_INT32(im, x, y) ((im)->image32[(y)][(x)])
#define IMAGING_PIXEL_FLOAT32(im, x, y) (((FLOAT32 *)(im)->image32[y])[x])

struct ImagingAccessInstance {
ModeID mode;
void (*get_pixel)(Imaging im, int x, int y, void *pixel);
Expand Down
Loading
Loading