It also shows how your web browser displays the BMP images,
-but that’s not its main purpose.
-BMP is poor image format to use on web pages, so a web browser’s
-level of support for it is arguably not important.
-
-
-
-
- | File |
- Ver. |
- Correct display |
- In your browser |
- Notes |
-
-
-
- | g/pal1.bmp |
- 3 |
-  |
-  |
- 1 bit/pixel paletted image, in which black is the first color in
- the palette. |
-
-
-
- | g/pal1wb.bmp |
- 3 |
- |
-  |
- 1 bit/pixel paletted image, in which white is the first color in
- the palette. |
-
-
-
- | g/pal1bg.bmp |
- 3 |
-  |
-  |
- 1 bit/pixel paletted image, with colors other than black and white. |
-
-
-
- | q/pal1p1.bmp |
- 3 |
-  |
-  |
- 1 bit/pixel paletted image, with only one color in the palette.
- The documentation says that 1-bpp images have a palette size of 2
- (not “up to 2”), but it would be silly for a viewer not to
- support a size of 1. |
-
-
-
- | q/pal2.bmp |
- 3 |
-  |
-  |
- A paletted image with 2 bits/pixel. Usually only 1, 4,
- and 8 are allowed, but 2 is legal on Windows CE. |
-
-
-
- | g/pal4.bmp |
- 3 |
-  |
-  |
- Paletted image with 12 palette colors, and 4 bits/pixel. |
-
-
-
- | g/pal4rle.bmp |
- 3 |
- |
-  |
- 4-bit image that uses RLE compression. |
-
-
-
- | q/pal4rletrns.bmp |
- 3 |
- 
- or
- or
 |
-  |
- An RLE-compressed image that used “delta”
- codes to skip over some pixels, leaving them undefined. Some viewers
- make undefined pixels transparent, others make them black, and
- others assign them palette color 0 (purple, in this case). |
-
-
-
- | g/pal8.bmp |
- 3 |
-  |
-  |
- Our standard paletted image, with 252 palette colors, and 8
- bits/pixel. |
-
-
-
- | g/pal8-0.bmp |
- 3 |
- |
-  |
- Every field that can be set to 0 is set to 0: pixels/meter=0;
- colors used=0 (meaning the default 256); size-of-image=0. |
-
-
-
- | g/pal8rle.bmp |
- 3 |
- |
-  |
- 8-bit image that uses RLE compression. |
-
-
-
- | q/pal8rletrns.bmp |
- 3 |
- 
- or
- or
 |
-  |
- 8-bit version of q/pal4rletrns.bmp. |
-
-
-
- | g/pal8w126.bmp |
- 3 |
-  |
-  |
- Images with different widths and heights.
- In BMP format, rows are padded to a multiple of four bytes, so we
- test all four possibilities. |
-
-
-
- | g/pal8w125.bmp |
- 3 |
-  |
-  |
-
-
-
- | g/pal8w124.bmp |
- 3 |
-  |
-  |
-
-
-
- | g/pal8topdown.bmp |
- 3 |
- |
-  |
- BMP images are normally stored from the bottom up, but
- there is a way to store them from the top down. |
-
-
-
- | q/pal8offs.bmp |
- 3 |
- |
-  |
- A file with some unused bytes between the palette and the
- image. This is probably valid, but I’m not 100% sure. |
-
-
-
- | q/pal8oversizepal.bmp |
- 3 |
- |
-  |
- An 8-bit image with 300 palette colors. This may be invalid,
- because the documentation could
- be interpreted to imply that 8-bit images aren’t allowed
- to have more than 256 colors. |
-
-
-
- | g/pal8nonsquare.bmp |
- 3 |
-
- 
- or
- 
- |
-  |
- An image with non-square pixels: the X pixels/meter is twice
- the Y pixels/meter. Image editors can be expected to
- leave the image “squashed”; image viewers should
- consider stretching it to its correct proportions. |
-
-
-
- | g/pal8os2.bmp |
- OS/2v1 |
- |
-  |
- An OS/2-style bitmap. |
-
-
-
- | q/pal8os2sp.bmp |
- OS/2v1 |
- |
-  |
- An OS/2v1 with a less-than-full-sized palette.
- Probably not valid, but such files have been seen in the wild. |
-
-
-
- | q/pal8os2v2.bmp |
- OS/2v2 |
- |
-  |
- My attempt to make an OS/2v2 bitmap. |
-
-
-
- | q/pal8os2v2-16.bmp |
- OS/2v2 |
- |
-  |
- An OS/2v2 bitmap whose header has only 16 bytes, instead of the full 64. |
-
-
-
- | g/pal8v4.bmp |
- 4 |
- |
-  |
- A v4 bitmap. I’m not sure that the gamma and chromaticity values in
- this file are sensible, because I can’t find any detailed documentation
- of them. |
-
-
-
- | g/pal8v5.bmp |
- 5 |
- |
-  |
- A v5 bitmap. Version 5 has additional colorspace options over v4, so it
- is easier to create, and ought to be more portable. |
-
-
-
- | g/rgb16.bmp |
- 3 |
-  |
-  |
- A 16-bit image with the default color format: 5 bits each for red,
- green, and blue, and 1 unused bit.
- The whitest colors should (I assume) be displayed as pure white:
- (255,255,255), not
- (248,248,248). |
-
-
-
- | g/rgb16-565.bmp |
- 3 |
-  |
-  |
- A 16-bit image with a BITFIELDS segment indicating 5 red, 6 green,
- and 5 blue bits. This is a standard 16-bit format, even supported by
- old versions of Windows that don’t support any other non-default 16-bit
- formats.
- The whitest colors should be displayed as pure white:
- (255,255,255), not
- (248,252,248). |
-
-
-
- | g/rgb16-565pal.bmp |
- 3 |
- |
-  |
- A 16-bit image with both a BITFIELDS segment and a palette. |
-
-
-
- | q/rgb16-231.bmp |
- 3 |
-  |
-  |
- An unusual and silly 16-bit image, with 2 red bits, 3 green bits, and 1
- blue bit. Most viewers do support this image, but the colors may be darkened
- with a yellow-green shadow. That’s because they’re doing simple
- bit-shifting (possibly including one round of bit replication), instead of
- proper scaling. |
-
-
-
- | q/rgba16-4444.bmp |
- 5 |
-  |
-  |
- A 16-bit image with an alpha channel. There are 4 bits for each color
- channel, and 4 bits for the alpha channel.
- It’s not clear if this is valid, but I can’t find anything that
- suggests it isn’t.
- |
-
-
-
- | g/rgb24.bmp |
- 3 |
-  |
-  |
- A perfectly ordinary 24-bit (truecolor) image. |
-
-
-
- | g/rgb24pal.bmp |
- 3 |
- |
-  |
- A 24-bit image, with a palette containing 256 colors. There is little if
- any reason for a truecolor image to contain a palette, but it is legal. |
-
-
-
- | q/rgb24largepal.bmp |
- 3 |
- |
-  |
- A 24-bit image, with a palette containing 300 colors.
- The fact that the palette has more than 256 colors may cause some viewers
- to complain, but the documentation does not mention a size limit. |
-
-
-
- | q/rgb24prof.bmp |
- 5 |
- |
-  |
- My attempt to make a BMP file with an embedded color profile. |
-
-
-
- | q/rgb24lprof.bmp |
- 5 |
- |
-  |
- My attempt to make a BMP file with a linked color profile. |
-
-
-
- | q/rgb24jpeg.bmp |
- 5 |
-  |
-  |
- My attempt to make BMP files with embedded JPEG and PNG images.
- These are not likely to be supported by much of anything (they’re
- intended for printers). |
-
-
-
- | q/rgb24png.bmp |
- 5 |
- |
-  |
-
-
-
- | g/rgb32.bmp |
- 3 |
- |
-  |
- A 32-bit image using the default color format for 32-bit images (no
- BITFIELDS segment). There are 8 bits per color channel, and 8 unused
- bits. The unused bits are set to 0. |
-
-
-
- | g/rgb32bf.bmp |
- 3 |
- |
-  |
- A 32-bit image with a BITFIELDS segment. As usual, there are 8 bits per
- color channel, and 8 unused bits. But the color channels are in an unusual
- order, so the viewer must read the BITFIELDS, and not just guess. |
-
-
-
- | q/rgb32fakealpha.bmp |
- 3 |
-
- or
- 
- |
-  |
- Same as g/rgb32.bmp, except that the unused bits are set to something
- other than 0.
- If the image becomes transparent toward the bottom, it probably means
- the viewer uses heuristics to guess whether the undefined
- data represents transparency. |
-
-
-
- | q/rgb32-111110.bmp |
- 3 |
- |
-  |
- A 32 bits/pixel image, with all 32 bits used: 11 each for red and
- green, and 10 for blue. As far as I know, this is perfectly valid, but it
- is unusual. |
-
-
-
- | q/rgba32.bmp |
- 5 |
-  |
-  |
- A BMP with an alpha channel. Transparency is barely documented,
- so it’s possible that this file is not correctly formed.
- The color channels are in an unusual order, to prevent viewers from
- passing this test by making a lucky guess. |
-
-
-
- | q/rgba32abf.bmp |
- 3 |
- |
-  |
- An image of type BI_ALHPABITFIELDS. Supposedly, this was used on
- Windows CE. I don’t know whether it is constructed correctly. |
-
-
-
-
- | b/badbitcount.bmp |
- 3 |
- N/A |
-  |
- Header indicates an absurdly large number of bits/pixel. |
-
-
-
- | b/badbitssize.bmp |
- 3 |
- N/A |
-  |
- Header incorrectly indicates that the bitmap is several GB in size. |
-
-
-
- | b/baddens1.bmp |
- 3 |
- N/A |
-  |
- Density (pixels per meter) suggests the image is much
- larger in one dimension than the other. |
-
-
-
- | b/baddens2.bmp |
- 3 |
- N/A |
-  |
-
-
-
- | b/badfilesize.bmp |
- 3 |
- N/A |
-  |
- Header incorrectly indicates that the file is several GB in size. |
-
-
-
- | b/badheadersize.bmp |
- ? |
- N/A |
-  |
- Header size is 66 bytes, which is not a valid size for any known BMP
- version. |
-
-
-
- | b/badpalettesize.bmp |
- 3 |
- N/A |
-  |
- Header incorrectly indicates that the palette contains an absurdly large
- number of colors. |
-
-
-
- | b/badplanes.bmp |
- 3 |
- N/A |
-  |
- The “planes” setting, which is required to be 1, is not 1. |
-
-
-
- | b/badrle.bmp |
- 3 |
- N/A |
-  |
- An invalid RLE-compressed image that tries to cause buffer overruns. |
-
-
-
- | b/badwidth.bmp |
- 3 |
- N/A |
-  |
- The image claims to be a negative number of pixels in width. |
-
-
-
- | b/pal8badindex.bmp |
- 3 |
- N/A |
-  |
- Many of the palette indices used in the image are not present in the
- palette. |
-
-
-
- | b/reallybig.bmp |
- 3 |
- N/A |
-  |
- An image with a very large reported width and height. |
-
-
-
- | b/rletopdown.bmp |
- 3 |
- N/A |
-  |
- An RLE-compressed image that tries to use top-down orientation,
- which isn’t allowed. |
-
-
-
- | b/shortfile.bmp |
- 3 |
- N/A |
-  |
- A file that has been truncated in the middle of the bitmap. |
-
-
-
-
-
-
-
diff --git a/Tests/images/bmp/html/fakealpha.png b/Tests/images/bmp/html/fakealpha.png
deleted file mode 100644
index 89292bcbb..000000000
Binary files a/Tests/images/bmp/html/fakealpha.png and /dev/null differ
diff --git a/Tests/images/bmp/html/pal1p1.png b/Tests/images/bmp/html/pal1p1.png
deleted file mode 100644
index 92fc0f945..000000000
Binary files a/Tests/images/bmp/html/pal1p1.png and /dev/null differ
diff --git a/Tests/images/bmp/html/pal2.png b/Tests/images/bmp/html/pal2.png
deleted file mode 100644
index 1bbfe175f..000000000
Binary files a/Tests/images/bmp/html/pal2.png and /dev/null differ
diff --git a/Tests/images/bmp/html/pal4rletrns-0.png b/Tests/images/bmp/html/pal4rletrns-0.png
deleted file mode 100644
index b689c842a..000000000
Binary files a/Tests/images/bmp/html/pal4rletrns-0.png and /dev/null differ
diff --git a/Tests/images/bmp/html/pal4rletrns-b.png b/Tests/images/bmp/html/pal4rletrns-b.png
deleted file mode 100644
index 9befa575f..000000000
Binary files a/Tests/images/bmp/html/pal4rletrns-b.png and /dev/null differ
diff --git a/Tests/images/bmp/html/pal4rletrns.png b/Tests/images/bmp/html/pal4rletrns.png
deleted file mode 100644
index 9b0c04436..000000000
Binary files a/Tests/images/bmp/html/pal4rletrns.png and /dev/null differ
diff --git a/Tests/images/bmp/html/pal8nonsquare-v.png b/Tests/images/bmp/html/pal8nonsquare-v.png
deleted file mode 100644
index a1cd1ab18..000000000
Binary files a/Tests/images/bmp/html/pal8nonsquare-v.png and /dev/null differ
diff --git a/Tests/images/bmp/html/pal8rletrns-0.png b/Tests/images/bmp/html/pal8rletrns-0.png
deleted file mode 100644
index a1c1fda50..000000000
Binary files a/Tests/images/bmp/html/pal8rletrns-0.png and /dev/null differ
diff --git a/Tests/images/bmp/html/pal8rletrns-b.png b/Tests/images/bmp/html/pal8rletrns-b.png
deleted file mode 100644
index 1ede504d4..000000000
Binary files a/Tests/images/bmp/html/pal8rletrns-b.png and /dev/null differ
diff --git a/Tests/images/bmp/html/pal8rletrns.png b/Tests/images/bmp/html/pal8rletrns.png
deleted file mode 100644
index 2d8e957f1..000000000
Binary files a/Tests/images/bmp/html/pal8rletrns.png and /dev/null differ
diff --git a/Tests/images/bmp/html/rgb16-231.png b/Tests/images/bmp/html/rgb16-231.png
deleted file mode 100644
index 76efe526e..000000000
Binary files a/Tests/images/bmp/html/rgb16-231.png and /dev/null differ
diff --git a/Tests/images/bmp/html/rgb24.jpg b/Tests/images/bmp/html/rgb24.jpg
deleted file mode 100644
index c43698c9b..000000000
Binary files a/Tests/images/bmp/html/rgb24.jpg and /dev/null differ
diff --git a/Tests/images/bmp/html/rgba16-4444.png b/Tests/images/bmp/html/rgba16-4444.png
deleted file mode 100644
index bfeda6fae..000000000
Binary files a/Tests/images/bmp/html/rgba16-4444.png and /dev/null differ
diff --git a/Tests/images/bmp/html/rgba32.png b/Tests/images/bmp/html/rgba32.png
deleted file mode 100644
index 25e542a65..000000000
Binary files a/Tests/images/bmp/html/rgba32.png and /dev/null differ
diff --git a/Tests/images/morph_a.png b/Tests/images/morph_a.png
index 19f6b777f..035fbc4bb 100644
Binary files a/Tests/images/morph_a.png and b/Tests/images/morph_a.png differ
diff --git a/Tests/test_bmp_reference.py b/Tests/test_bmp_reference.py
index 82cab39c6..8fbd73748 100644
--- a/Tests/test_bmp_reference.py
+++ b/Tests/test_bmp_reference.py
@@ -72,7 +72,7 @@ def test_good() -> None:
"pal8-0.bmp": "pal8.png",
"pal8rle.bmp": "pal8.png",
"pal8topdown.bmp": "pal8.png",
- "pal8nonsquare.bmp": "pal8nonsquare-v.png",
+ "pal8nonsquare.bmp": "pal8nonsquare-e.png",
"pal8os2.bmp": "pal8.png",
"pal8os2sp.bmp": "pal8.png",
"pal8os2v2.bmp": "pal8.png",
@@ -95,16 +95,16 @@ def test_good() -> None:
for f in get_files("g"):
try:
with Image.open(f) as im:
- im.load()
with Image.open(get_compare(f)) as compare:
- compare.load()
- if im.mode == "P":
- # assert image similar doesn't really work
- # with paletized image, since the palette might
- # be differently ordered for an equivalent image.
- im = im.convert("RGBA")
- compare = im.convert("RGBA")
- assert_image_similar(im, compare, 5)
+ # assert image similar doesn't really work
+ # with paletized image, since the palette might
+ # be differently ordered for an equivalent image.
+ im_converted = im.convert("RGBA") if im.mode == "P" else im
+ compare_converted = (
+ compare.convert("RGBA") if im.mode == "P" else compare
+ )
+
+ assert_image_similar(im_converted, compare_converted, 5)
except Exception as msg:
# there are three here that are unsupported:
diff --git a/Tests/test_box_blur.py b/Tests/test_box_blur.py
index cb267b204..07e62db8c 100644
--- a/Tests/test_box_blur.py
+++ b/Tests/test_box_blur.py
@@ -28,9 +28,13 @@ def box_blur(image: Image.Image, radius: float = 1, n: int = 1) -> Image.Image:
def assert_image(im: Image.Image, data: list[list[int]], delta: int = 0) -> None:
- it = iter(im.getdata())
+ it = iter(im.get_flattened_data())
for data_row in data:
- im_row = [next(it) for _ in range(im.size[0])]
+ im_row = []
+ for _ in range(im.width):
+ im_v = next(it)
+ assert isinstance(im_v, (int, float))
+ im_row.append(im_v)
if any(abs(data_v - im_v) > delta for data_v, im_v in zip(data_row, im_row)):
assert im_row == data_row
with pytest.raises(StopIteration):
diff --git a/Tests/test_file_apng.py b/Tests/test_file_apng.py
index 12204b5b7..b57a1d1ad 100644
--- a/Tests/test_file_apng.py
+++ b/Tests/test_file_apng.py
@@ -1,5 +1,6 @@
from __future__ import annotations
+from io import BytesIO
from pathlib import Path
import pytest
@@ -277,25 +278,25 @@ def test_apng_mode() -> None:
assert isinstance(im, PngImagePlugin.PngImageFile)
assert im.mode == "P"
im.seek(im.n_frames - 1)
- im = im.convert("RGB")
- assert im.getpixel((0, 0)) == (0, 255, 0)
- assert im.getpixel((64, 32)) == (0, 255, 0)
+ im_rgb = im.convert("RGB")
+ assert im_rgb.getpixel((0, 0)) == (0, 255, 0)
+ assert im_rgb.getpixel((64, 32)) == (0, 255, 0)
with Image.open("Tests/images/apng/mode_palette_alpha.png") as im:
assert isinstance(im, PngImagePlugin.PngImageFile)
assert im.mode == "P"
im.seek(im.n_frames - 1)
- im = im.convert("RGBA")
- assert im.getpixel((0, 0)) == (0, 255, 0, 255)
- assert im.getpixel((64, 32)) == (0, 255, 0, 255)
+ im_rgba = im.convert("RGBA")
+ assert im_rgba.getpixel((0, 0)) == (0, 255, 0, 255)
+ assert im_rgba.getpixel((64, 32)) == (0, 255, 0, 255)
with Image.open("Tests/images/apng/mode_palette_1bit_alpha.png") as im:
assert isinstance(im, PngImagePlugin.PngImageFile)
assert im.mode == "P"
im.seek(im.n_frames - 1)
- im = im.convert("RGBA")
- assert im.getpixel((0, 0)) == (0, 0, 255, 128)
- assert im.getpixel((64, 32)) == (0, 0, 255, 128)
+ im_rgba = im.convert("RGBA")
+ assert im_rgba.getpixel((0, 0)) == (0, 0, 255, 128)
+ assert im_rgba.getpixel((64, 32)) == (0, 0, 255, 128)
def test_apng_chunk_errors() -> None:
@@ -517,6 +518,24 @@ def test_apng_save_duration_loop(tmp_path: Path) -> None:
assert im.info["duration"] == 600
+def test_apng_save_duration_float(tmp_path: Path) -> None:
+ test_file = tmp_path / "temp.png"
+ im = Image.new("1", (1, 1))
+ im2 = Image.new("1", (1, 1), 1)
+ im.save(test_file, save_all=True, append_images=[im2], duration=0.5)
+
+ with Image.open(test_file) as reloaded:
+ assert reloaded.info["duration"] == 0.5
+
+
+def test_apng_save_large_duration(tmp_path: Path) -> None:
+ test_file = tmp_path / "temp.png"
+ im = Image.new("1", (1, 1))
+ im2 = Image.new("1", (1, 1), 1)
+ with pytest.raises(ValueError, match="cannot write duration"):
+ im.save(test_file, save_all=True, append_images=[im2], duration=65536000)
+
+
def test_apng_save_disposal(tmp_path: Path) -> None:
test_file = tmp_path / "temp.png"
size = (128, 64)
@@ -718,6 +737,25 @@ def test_apng_save_size(tmp_path: Path) -> None:
assert reloaded.size == (200, 200)
+def test_compress_level() -> None:
+ compress_level_sizes = {}
+ for compress_level in (0, 9):
+ out = BytesIO()
+
+ im = Image.new("L", (100, 100))
+ im.save(
+ out,
+ "PNG",
+ save_all=True,
+ append_images=[Image.new("L", (200, 200))],
+ compress_level=compress_level,
+ )
+
+ compress_level_sizes[compress_level] = len(out.getvalue())
+
+ assert compress_level_sizes[0] > compress_level_sizes[9]
+
+
def test_seek_after_close() -> None:
im = Image.open("Tests/images/apng/delay.png")
im.seek(1)
diff --git a/Tests/test_file_avif.py b/Tests/test_file_avif.py
index 727191153..ffc4ce021 100644
--- a/Tests/test_file_avif.py
+++ b/Tests/test_file_avif.py
@@ -121,7 +121,6 @@ class TestFileAvif:
assert image.size == (128, 128)
assert image.format == "AVIF"
assert image.get_format_mimetype() == "image/avif"
- image.getdata()
# generated with:
# avifdec hopper.avif hopper_avif_write.png
@@ -143,7 +142,6 @@ class TestFileAvif:
assert reloaded.mode == "RGB"
assert reloaded.size == (128, 128)
assert reloaded.format == "AVIF"
- reloaded.getdata()
# avifdec hopper.avif avif/hopper_avif_write.png
assert_image_similar_tofile(
diff --git a/Tests/test_file_bmp.py b/Tests/test_file_bmp.py
index c1c430aa5..28e863459 100644
--- a/Tests/test_file_bmp.py
+++ b/Tests/test_file_bmp.py
@@ -165,9 +165,9 @@ def test_rgba_bitfields() -> None:
with Image.open("Tests/images/rgb32bf-rgba.bmp") as im:
# So before the comparing the image, swap the channels
b, g, r = im.split()[1:]
- im = Image.merge("RGB", (r, g, b))
+ im_rgb = Image.merge("RGB", (r, g, b))
- assert_image_equal_tofile(im, "Tests/images/bmp/q/rgb32bf-xbgr.bmp")
+ assert_image_equal_tofile(im_rgb, "Tests/images/bmp/q/rgb32bf-xbgr.bmp")
# This test image has been manually hexedited
# to change the bitfield compression in the header from XBGR to ABGR
diff --git a/Tests/test_file_bufrstub.py b/Tests/test_file_bufrstub.py
index 362578c56..8c6bb1a69 100644
--- a/Tests/test_file_bufrstub.py
+++ b/Tests/test_file_bufrstub.py
@@ -61,6 +61,7 @@ def test_handler(tmp_path: Path) -> None:
def load(self, im: ImageFile.StubImageFile) -> Image.Image:
self.loaded = True
+ assert im.fp is not None
im.fp.close()
return Image.new("RGB", (1, 1))
diff --git a/Tests/test_file_dds.py b/Tests/test_file_dds.py
index 60d0c09bc..931ff02f1 100644
--- a/Tests/test_file_dds.py
+++ b/Tests/test_file_dds.py
@@ -57,7 +57,7 @@ TEST_FILE_UNCOMPRESSED_RGB_WITH_ALPHA = "Tests/images/uncompressed_rgb.dds"
def test_sanity_dxt1_bc1(image_path: str) -> None:
"""Check DXT1 and BC1 images can be opened"""
with Image.open(TEST_FILE_DXT1.replace(".dds", ".png")) as target:
- target = target.convert("RGBA")
+ target_rgba = target.convert("RGBA")
with Image.open(image_path) as im:
im.load()
@@ -65,7 +65,7 @@ def test_sanity_dxt1_bc1(image_path: str) -> None:
assert im.mode == "RGBA"
assert im.size == (256, 256)
- assert_image_equal(im, target)
+ assert_image_equal(im, target_rgba)
def test_sanity_dxt3() -> None:
@@ -520,9 +520,9 @@ def test_save_dx10_bc5(tmp_path: Path) -> None:
im.save(out, pixel_format="BC5")
assert_image_similar_tofile(im, out, 9.56)
- im = hopper("L")
+ im_l = hopper("L")
with pytest.raises(OSError, match="only RGB mode can be written as BC5"):
- im.save(out, pixel_format="BC5")
+ im_l.save(out, pixel_format="BC5")
@pytest.mark.parametrize(
diff --git a/Tests/test_file_eps.py b/Tests/test_file_eps.py
index b50915f28..d4e8db4f4 100644
--- a/Tests/test_file_eps.py
+++ b/Tests/test_file_eps.py
@@ -265,9 +265,9 @@ def test_bytesio_object() -> None:
img.load()
with Image.open(FILE1_COMPARE) as image1_scale1_compare:
- image1_scale1_compare = image1_scale1_compare.convert("RGB")
- image1_scale1_compare.load()
- assert_image_similar(img, image1_scale1_compare, 5)
+ image1_scale1_compare_rgb = image1_scale1_compare.convert("RGB")
+ image1_scale1_compare_rgb.load()
+ assert_image_similar(img, image1_scale1_compare_rgb, 5)
@pytest.mark.skipif(not HAS_GHOSTSCRIPT, reason="Ghostscript not available")
@@ -301,17 +301,17 @@ def test_render_scale1() -> None:
with Image.open(FILE1) as image1_scale1:
image1_scale1.load()
with Image.open(FILE1_COMPARE) as image1_scale1_compare:
- image1_scale1_compare = image1_scale1_compare.convert("RGB")
- image1_scale1_compare.load()
- assert_image_similar(image1_scale1, image1_scale1_compare, 5)
+ image1_scale1_compare_rgb = image1_scale1_compare.convert("RGB")
+ image1_scale1_compare_rgb.load()
+ assert_image_similar(image1_scale1, image1_scale1_compare_rgb, 5)
# Non-zero bounding box
with Image.open(FILE2) as image2_scale1:
image2_scale1.load()
with Image.open(FILE2_COMPARE) as image2_scale1_compare:
- image2_scale1_compare = image2_scale1_compare.convert("RGB")
- image2_scale1_compare.load()
- assert_image_similar(image2_scale1, image2_scale1_compare, 10)
+ image2_scale1_compare_rgb = image2_scale1_compare.convert("RGB")
+ image2_scale1_compare_rgb.load()
+ assert_image_similar(image2_scale1, image2_scale1_compare_rgb, 10)
@pytest.mark.skipif(not HAS_GHOSTSCRIPT, reason="Ghostscript not available")
@@ -324,18 +324,16 @@ def test_render_scale2() -> None:
assert isinstance(image1_scale2, EpsImagePlugin.EpsImageFile)
image1_scale2.load(scale=2)
with Image.open(FILE1_COMPARE_SCALE2) as image1_scale2_compare:
- image1_scale2_compare = image1_scale2_compare.convert("RGB")
- image1_scale2_compare.load()
- assert_image_similar(image1_scale2, image1_scale2_compare, 5)
+ image1_scale2_compare_rgb = image1_scale2_compare.convert("RGB")
+ assert_image_similar(image1_scale2, image1_scale2_compare_rgb, 5)
# Non-zero bounding box
with Image.open(FILE2) as image2_scale2:
assert isinstance(image2_scale2, EpsImagePlugin.EpsImageFile)
image2_scale2.load(scale=2)
with Image.open(FILE2_COMPARE_SCALE2) as image2_scale2_compare:
- image2_scale2_compare = image2_scale2_compare.convert("RGB")
- image2_scale2_compare.load()
- assert_image_similar(image2_scale2, image2_scale2_compare, 10)
+ image2_scale2_compare_rgb = image2_scale2_compare.convert("RGB")
+ assert_image_similar(image2_scale2, image2_scale2_compare_rgb, 10)
@pytest.mark.skipif(not HAS_GHOSTSCRIPT, reason="Ghostscript not available")
@@ -345,8 +343,8 @@ def test_render_scale2() -> None:
def test_resize(filename: str) -> None:
with Image.open(filename) as im:
new_size = (100, 100)
- im = im.resize(new_size)
- assert im.size == new_size
+ im_resized = im.resize(new_size)
+ assert im_resized.size == new_size
@pytest.mark.skipif(not HAS_GHOSTSCRIPT, reason="Ghostscript not available")
diff --git a/Tests/test_file_gif.py b/Tests/test_file_gif.py
index acf79374e..2615f5a60 100644
--- a/Tests/test_file_gif.py
+++ b/Tests/test_file_gif.py
@@ -327,14 +327,13 @@ def test_loading_multiple_palettes(path: str, mode: str) -> None:
im.seek(1)
assert im.mode == mode
- if mode == "RGBA":
- im = im.convert("RGB")
+ im_rgb = im.convert("RGB") if mode == "RGBA" else im
# Check a color only from the old palette
- assert im.getpixel((0, 0)) == original_color
+ assert im_rgb.getpixel((0, 0)) == original_color
# Check a color from the new palette
- assert im.getpixel((24, 24)) not in first_frame_colors
+ assert im_rgb.getpixel((24, 24)) not in first_frame_colors
def test_headers_saving_for_animated_gifs(tmp_path: Path) -> None:
@@ -354,16 +353,16 @@ def test_palette_handling(tmp_path: Path) -> None:
# see https://github.com/python-pillow/Pillow/issues/513
with Image.open(TEST_GIF) as im:
- im = im.convert("RGB")
+ im_rgb = im.convert("RGB")
- im = im.resize((100, 100), Image.Resampling.LANCZOS)
- im2 = im.convert("P", palette=Image.Palette.ADAPTIVE, colors=256)
+ im_rgb = im_rgb.resize((100, 100), Image.Resampling.LANCZOS)
+ im_p = im_rgb.convert("P", palette=Image.Palette.ADAPTIVE, colors=256)
- f = tmp_path / "temp.gif"
- im2.save(f, optimize=True)
+ f = tmp_path / "temp.gif"
+ im_p.save(f, optimize=True)
with Image.open(f) as reloaded:
- assert_image_similar(im, reloaded.convert("RGB"), 10)
+ assert_image_similar(im_rgb, reloaded.convert("RGB"), 10)
def test_palette_434(tmp_path: Path) -> None:
@@ -383,35 +382,36 @@ def test_palette_434(tmp_path: Path) -> None:
with roundtrip(im, optimize=True) as reloaded:
assert_image_similar(im, reloaded, 1)
- im = im.convert("RGB")
- # check automatic P conversion
- with roundtrip(im) as reloaded:
- reloaded = reloaded.convert("RGB")
- assert_image_equal(im, reloaded)
+ im_rgb = im.convert("RGB")
+
+ # check automatic P conversion
+ with roundtrip(im_rgb) as reloaded:
+ reloaded = reloaded.convert("RGB")
+ assert_image_equal(im_rgb, reloaded)
@pytest.mark.skipif(not netpbm_available(), reason="Netpbm not available")
def test_save_netpbm_bmp_mode(tmp_path: Path) -> None:
with Image.open(TEST_GIF) as img:
- img = img.convert("RGB")
+ img_rgb = img.convert("RGB")
- tempfile = str(tmp_path / "temp.gif")
- b = BytesIO()
- GifImagePlugin._save_netpbm(img, b, tempfile)
- with Image.open(tempfile) as reloaded:
- assert_image_similar(img, reloaded.convert("RGB"), 0)
+ tempfile = str(tmp_path / "temp.gif")
+ b = BytesIO()
+ GifImagePlugin._save_netpbm(img_rgb, b, tempfile)
+ with Image.open(tempfile) as reloaded:
+ assert_image_similar(img_rgb, reloaded.convert("RGB"), 0)
@pytest.mark.skipif(not netpbm_available(), reason="Netpbm not available")
def test_save_netpbm_l_mode(tmp_path: Path) -> None:
with Image.open(TEST_GIF) as img:
- img = img.convert("L")
+ img_l = img.convert("L")
tempfile = str(tmp_path / "temp.gif")
b = BytesIO()
- GifImagePlugin._save_netpbm(img, b, tempfile)
+ GifImagePlugin._save_netpbm(img_l, b, tempfile)
with Image.open(tempfile) as reloaded:
- assert_image_similar(img, reloaded.convert("L"), 0)
+ assert_image_similar(img_l, reloaded.convert("L"), 0)
def test_seek() -> None:
@@ -1038,9 +1038,9 @@ def test_webp_background(tmp_path: Path) -> None:
im.save(out)
# Test non-opaque WebP background
- im = Image.new("L", (100, 100), "#000")
- im.info["background"] = (0, 0, 0, 0)
- im.save(out)
+ im2 = Image.new("L", (100, 100), "#000")
+ im2.info["background"] = (0, 0, 0, 0)
+ im2.save(out)
def test_comment(tmp_path: Path) -> None:
@@ -1048,16 +1048,16 @@ def test_comment(tmp_path: Path) -> None:
assert im.info["comment"] == b"File written by Adobe Photoshop\xa8 4.0"
out = tmp_path / "temp.gif"
- im = Image.new("L", (100, 100), "#000")
- im.info["comment"] = b"Test comment text"
- im.save(out)
+ im2 = Image.new("L", (100, 100), "#000")
+ im2.info["comment"] = b"Test comment text"
+ im2.save(out)
with Image.open(out) as reread:
- assert reread.info["comment"] == im.info["comment"]
+ assert reread.info["comment"] == im2.info["comment"]
- im.info["comment"] = "Test comment text"
- im.save(out)
+ im2.info["comment"] = "Test comment text"
+ im2.save(out)
with Image.open(out) as reread:
- assert reread.info["comment"] == im.info["comment"].encode()
+ assert reread.info["comment"] == im2.info["comment"].encode()
# Test that GIF89a is used for comments
assert reread.info["version"] == b"GIF89a"
diff --git a/Tests/test_file_gribstub.py b/Tests/test_file_gribstub.py
index 960e5f4be..05925d502 100644
--- a/Tests/test_file_gribstub.py
+++ b/Tests/test_file_gribstub.py
@@ -59,8 +59,9 @@ def test_handler(tmp_path: Path) -> None:
def open(self, im: Image.Image) -> None:
self.opened = True
- def load(self, im: Image.Image) -> Image.Image:
+ def load(self, im: ImageFile.ImageFile) -> Image.Image:
self.loaded = True
+ assert im.fp is not None
im.fp.close()
return Image.new("RGB", (1, 1))
diff --git a/Tests/test_file_hdf5stub.py b/Tests/test_file_hdf5stub.py
index e4f09a09c..e1a56309b 100644
--- a/Tests/test_file_hdf5stub.py
+++ b/Tests/test_file_hdf5stub.py
@@ -61,8 +61,9 @@ def test_handler(tmp_path: Path) -> None:
def open(self, im: Image.Image) -> None:
self.opened = True
- def load(self, im: Image.Image) -> Image.Image:
+ def load(self, im: ImageFile.ImageFile) -> Image.Image:
self.loaded = True
+ assert im.fp is not None
im.fp.close()
return Image.new("RGB", (1, 1))
diff --git a/Tests/test_file_iptc.py b/Tests/test_file_iptc.py
index 0376b9997..3eb5cde8e 100644
--- a/Tests/test_file_iptc.py
+++ b/Tests/test_file_iptc.py
@@ -6,7 +6,7 @@ import pytest
from PIL import Image, IptcImagePlugin, TiffImagePlugin, TiffTags
-from .helper import assert_image_equal, hopper
+from .helper import assert_image_equal
TEST_FILE = "Tests/images/iptc.jpg"
@@ -85,7 +85,7 @@ def test_getiptcinfo() -> None:
def test_getiptcinfo_jpg_none() -> None:
# Arrange
- with hopper() as im:
+ with Image.open("Tests/images/hopper.jpg") as im:
# Act
iptc = IptcImagePlugin.getiptcinfo(im)
@@ -143,6 +143,7 @@ def test_getiptcinfo_tiff() -> None:
# Test with LONG tag type
with Image.open("Tests/images/hopper.Lab.tif") as im:
+ assert isinstance(im, TiffImagePlugin.TiffImageFile)
im.tag_v2.tagtype[TiffImagePlugin.IPTC_NAA_CHUNK] = TiffTags.LONG
iptc = IptcImagePlugin.getiptcinfo(im)
diff --git a/Tests/test_file_jpeg.py b/Tests/test_file_jpeg.py
index 96e7f4239..f818927f6 100644
--- a/Tests/test_file_jpeg.py
+++ b/Tests/test_file_jpeg.py
@@ -1133,8 +1133,9 @@ class TestFileCloseW32:
im.save(tmpfile)
im = Image.open(tmpfile)
+ assert im.fp is not None
+ assert not im.fp.closed
fp = im.fp
- assert not fp.closed
with pytest.raises(OSError):
os.remove(tmpfile)
im.load()
diff --git a/Tests/test_file_jpeg2k.py b/Tests/test_file_jpeg2k.py
index a5365a90d..575d911de 100644
--- a/Tests/test_file_jpeg2k.py
+++ b/Tests/test_file_jpeg2k.py
@@ -164,7 +164,7 @@ def test_reduce() -> None:
with Image.open("Tests/images/test-card-lossless.jp2") as im:
assert callable(im.reduce)
- im.reduce = 2
+ im.reduce = 2 # type: ignore[assignment, method-assign]
assert im.reduce == 2
im.load()
diff --git a/Tests/test_file_libtiff.py b/Tests/test_file_libtiff.py
index 4908496cf..c2336c058 100644
--- a/Tests/test_file_libtiff.py
+++ b/Tests/test_file_libtiff.py
@@ -11,7 +11,15 @@ from typing import Any, NamedTuple
import pytest
-from PIL import Image, ImageFilter, ImageOps, TiffImagePlugin, TiffTags, features
+from PIL import (
+ Image,
+ ImageFile,
+ ImageFilter,
+ ImageOps,
+ TiffImagePlugin,
+ TiffTags,
+ features,
+)
from PIL.TiffImagePlugin import OSUBFILETYPE, SAMPLEFORMAT, STRIPOFFSETS, SUBIFD
from .helper import (
@@ -27,14 +35,13 @@ from .helper import (
@skip_unless_feature("libtiff")
class LibTiffTestCase:
- def _assert_noerr(self, tmp_path: Path, im: TiffImagePlugin.TiffImageFile) -> None:
+ def _assert_noerr(self, tmp_path: Path, im: ImageFile.ImageFile) -> None:
"""Helper tests that assert basic sanity about the g4 tiff reading"""
# 1 bit
assert im.mode == "1"
# Does the data actually load
im.load()
- im.getdata()
assert isinstance(im, TiffImagePlugin.TiffImageFile)
assert im._compression == "group4"
@@ -355,6 +362,36 @@ class TestFileLibTiff(LibTiffTestCase):
# Should not segfault
im.save(outfile)
+ @pytest.mark.parametrize("tagtype", (TiffTags.SIGNED_RATIONAL, TiffTags.IFD))
+ def test_tag_type(
+ self, tagtype: int, monkeypatch: pytest.MonkeyPatch, tmp_path: Path
+ ) -> None:
+ monkeypatch.setattr(TiffImagePlugin, "WRITE_LIBTIFF", True)
+
+ ifd = TiffImagePlugin.ImageFileDirectory_v2()
+ ifd[37000] = 100
+ ifd.tagtype[37000] = tagtype
+
+ out = tmp_path / "temp.tif"
+ im = Image.new("L", (1, 1))
+ im.save(out, tiffinfo=ifd)
+
+ with Image.open(out) as reloaded:
+ assert isinstance(reloaded, TiffImagePlugin.TiffImageFile)
+ assert reloaded.tag_v2[37000] == 100
+
+ def test_inknames_tag(
+ self, monkeypatch: pytest.MonkeyPatch, tmp_path: Path
+ ) -> None:
+ monkeypatch.setattr(TiffImagePlugin, "WRITE_LIBTIFF", True)
+
+ out = tmp_path / "temp.tif"
+ hopper("L").save(out, tiffinfo={333: "name\x00"})
+
+ with Image.open(out) as reloaded:
+ assert isinstance(reloaded, TiffImagePlugin.TiffImageFile)
+ assert reloaded.tag_v2[333] in ("name", "name\x00")
+
def test_whitepoint_tag(
self, monkeypatch: pytest.MonkeyPatch, tmp_path: Path
) -> None:
@@ -478,12 +515,12 @@ class TestFileLibTiff(LibTiffTestCase):
# and save to compressed tif.
out = tmp_path / "temp.tif"
with Image.open("Tests/images/pport_g4.tif") as im:
- im = im.convert("L")
+ im_l = im.convert("L")
- im = im.filter(ImageFilter.GaussianBlur(4))
- im.save(out, compression="tiff_adobe_deflate")
+ im_l = im_l.filter(ImageFilter.GaussianBlur(4))
+ im_l.save(out, compression="tiff_adobe_deflate")
- assert_image_equal_tofile(im, out)
+ assert_image_equal_tofile(im_l, out)
def test_compressions(self, tmp_path: Path) -> None:
# Test various tiff compressions and assert similar image content but reduced
@@ -572,8 +609,9 @@ class TestFileLibTiff(LibTiffTestCase):
im.save(out, compression=compression)
def test_fp_leak(self) -> None:
- im: Image.Image | None = Image.open("Tests/images/hopper_g4_500.tif")
+ im: ImageFile.ImageFile | None = Image.open("Tests/images/hopper_g4_500.tif")
assert im is not None
+ assert im.fp is not None
fn = im.fp.fileno()
os.fstat(fn)
@@ -1049,8 +1087,10 @@ class TestFileLibTiff(LibTiffTestCase):
data = data[:102] + b"\x02" + data[103:]
with Image.open(io.BytesIO(data)) as im:
- im = im.transpose(Image.Transpose.FLIP_LEFT_RIGHT)
- assert_image_equal_tofile(im, "Tests/images/old-style-jpeg-compression.png")
+ im_transposed = im.transpose(Image.Transpose.FLIP_LEFT_RIGHT)
+ assert_image_equal_tofile(
+ im_transposed, "Tests/images/old-style-jpeg-compression.png"
+ )
def test_open_missing_samplesperpixel(self) -> None:
with Image.open(
@@ -1117,9 +1157,9 @@ class TestFileLibTiff(LibTiffTestCase):
with Image.open("Tests/images/g4_orientation_1.tif") as base_im:
for i in range(2, 9):
with Image.open("Tests/images/g4_orientation_" + str(i) + ".tif") as im:
- im = ImageOps.exif_transpose(im)
+ im_transposed = ImageOps.exif_transpose(im)
- assert_image_similar(base_im, im, 0.7)
+ assert_image_similar(base_im, im_transposed, 0.7)
@pytest.mark.parametrize(
"test_file",
diff --git a/Tests/test_file_mic.py b/Tests/test_file_mic.py
index 9aeb306e4..0706af4c0 100644
--- a/Tests/test_file_mic.py
+++ b/Tests/test_file_mic.py
@@ -22,10 +22,10 @@ def test_sanity() -> None:
# Adjust for the gamma of 2.2 encoded into the file
lut = ImagePalette.make_gamma_lut(1 / 2.2)
- im = Image.merge("RGBA", [chan.point(lut) for chan in im.split()])
+ im1 = Image.merge("RGBA", [chan.point(lut) for chan in im.split()])
im2 = hopper("RGBA")
- assert_image_similar(im, im2, 10)
+ assert_image_similar(im1, im2, 10)
def test_n_frames() -> None:
diff --git a/Tests/test_file_mpo.py b/Tests/test_file_mpo.py
index f947d1419..4db62bd6d 100644
--- a/Tests/test_file_mpo.py
+++ b/Tests/test_file_mpo.py
@@ -300,12 +300,12 @@ def test_save_all() -> None:
im_reloaded.seek(1)
assert_image_similar(im, im_reloaded, 30)
- im = Image.new("RGB", (1, 1))
+ im_rgb = Image.new("RGB", (1, 1))
for colors in (("#f00",), ("#f00", "#0f0")):
append_images = [Image.new("RGB", (1, 1), color) for color in colors]
- im_reloaded = roundtrip(im, save_all=True, append_images=append_images)
+ im_reloaded = roundtrip(im_rgb, save_all=True, append_images=append_images)
- assert_image_equal(im, im_reloaded)
+ assert_image_equal(im_rgb, im_reloaded)
assert isinstance(im_reloaded, MpoImagePlugin.MpoImageFile)
assert im_reloaded.mpinfo is not None
assert im_reloaded.mpinfo[45056] == b"0100"
@@ -315,7 +315,7 @@ def test_save_all() -> None:
assert_image_similar(im_reloaded, im_expected, 1)
# Test that a single frame image will not be saved as an MPO
- jpg = roundtrip(im, save_all=True)
+ jpg = roundtrip(im_rgb, save_all=True)
assert "mp" not in jpg.info
diff --git a/Tests/test_file_png.py b/Tests/test_file_png.py
index dc1077fed..ed3a91285 100644
--- a/Tests/test_file_png.py
+++ b/Tests/test_file_png.py
@@ -101,12 +101,13 @@ class TestFilePng:
assert im.get_format_mimetype() == "image/png"
for mode in ["1", "L", "P", "RGB", "I;16", "I;16B"]:
- im = hopper(mode)
- im.save(test_file)
+ im1 = hopper(mode)
+ im1.save(test_file)
with Image.open(test_file) as reloaded:
- if mode == "I;16B":
- reloaded = reloaded.convert(mode)
- assert_image_equal(reloaded, im)
+ converted_reloaded = (
+ reloaded.convert(mode) if mode == "I;16B" else reloaded
+ )
+ assert_image_equal(converted_reloaded, im1)
def test_invalid_file(self) -> None:
invalid_file = "Tests/images/flower.jpg"
@@ -225,11 +226,11 @@ class TestFilePng:
test_file = "Tests/images/pil123p.png"
with Image.open(test_file) as im:
assert_image(im, "P", (162, 150))
- im = im.convert("RGBA")
- assert_image(im, "RGBA", (162, 150))
+ im_rgba = im.convert("RGBA")
+ assert_image(im_rgba, "RGBA", (162, 150))
# image has 124 unique alpha values
- colors = im.getchannel("A").getcolors()
+ colors = im_rgba.getchannel("A").getcolors()
assert colors is not None
assert len(colors) == 124
@@ -239,11 +240,11 @@ class TestFilePng:
assert im.info["transparency"] == (0, 255, 52)
assert_image(im, "RGB", (64, 64))
- im = im.convert("RGBA")
- assert_image(im, "RGBA", (64, 64))
+ im_rgba = im.convert("RGBA")
+ assert_image(im_rgba, "RGBA", (64, 64))
# image has 876 transparent pixels
- colors = im.getchannel("A").getcolors()
+ colors = im_rgba.getchannel("A").getcolors()
assert colors is not None
assert colors[0][0] == 876
@@ -262,11 +263,11 @@ class TestFilePng:
assert len(im.info["transparency"]) == 256
assert_image(im, "P", (162, 150))
- im = im.convert("RGBA")
- assert_image(im, "RGBA", (162, 150))
+ im_rgba = im.convert("RGBA")
+ assert_image(im_rgba, "RGBA", (162, 150))
# image has 124 unique alpha values
- colors = im.getchannel("A").getcolors()
+ colors = im_rgba.getchannel("A").getcolors()
assert colors is not None
assert len(colors) == 124
@@ -285,13 +286,13 @@ class TestFilePng:
assert im.info["transparency"] == 164
assert im.getpixel((31, 31)) == 164
assert_image(im, "P", (64, 64))
- im = im.convert("RGBA")
- assert_image(im, "RGBA", (64, 64))
+ im_rgba = im.convert("RGBA")
+ assert_image(im_rgba, "RGBA", (64, 64))
- assert im.getpixel((31, 31)) == (0, 255, 52, 0)
+ assert im_rgba.getpixel((31, 31)) == (0, 255, 52, 0)
# image has 876 transparent pixels
- colors = im.getchannel("A").getcolors()
+ colors = im_rgba.getchannel("A").getcolors()
assert colors is not None
assert colors[0][0] == 876
@@ -338,6 +339,15 @@ class TestFilePng:
assert colors is not None
assert colors[0][0] == num_transparent
+ def test_save_1_transparency(self, tmp_path: Path) -> None:
+ out = tmp_path / "temp.png"
+
+ im = Image.new("1", (1, 1), 1)
+ im.save(out, transparency=1)
+
+ with Image.open(out) as reloaded:
+ assert reloaded.info["transparency"] == 255
+
def test_save_rgb_single_transparency(self, tmp_path: Path) -> None:
in_file = "Tests/images/caption_6_33_22.png"
with Image.open(in_file) as im:
@@ -778,7 +788,9 @@ class TestFilePng:
im.save(test_file, exif=im.getexif())
with Image.open(test_file) as reloaded:
+ assert isinstance(reloaded, PngImagePlugin.PngImageFile)
exif = reloaded._getexif()
+ assert exif is not None
assert exif[305] == "Adobe Photoshop CS Macintosh"
def test_exif_argument(self, tmp_path: Path) -> None:
@@ -811,7 +823,7 @@ class TestFilePng:
monkeypatch.setattr(sys, "stdout", mystdout)
with Image.open(TEST_PNG_FILE) as im:
- im.save(sys.stdout, "PNG")
+ im.save(sys.stdout, "PNG") # type: ignore[arg-type]
if isinstance(mystdout, MyStdOut):
mystdout = mystdout.buffer
diff --git a/Tests/test_file_ppm.py b/Tests/test_file_ppm.py
index 598e9a445..fbca46be5 100644
--- a/Tests/test_file_ppm.py
+++ b/Tests/test_file_ppm.py
@@ -389,7 +389,7 @@ def test_save_stdout(buffer: bool, monkeypatch: pytest.MonkeyPatch) -> None:
monkeypatch.setattr(sys, "stdout", mystdout)
with Image.open(TEST_FILE) as im:
- im.save(sys.stdout, "PPM")
+ im.save(sys.stdout, "PPM") # type: ignore[arg-type]
if isinstance(mystdout, MyStdOut):
mystdout = mystdout.buffer
diff --git a/Tests/test_file_sun.py b/Tests/test_file_sun.py
index c2f162cf9..78534e154 100644
--- a/Tests/test_file_sun.py
+++ b/Tests/test_file_sun.py
@@ -84,8 +84,8 @@ def test_rgbx() -> None:
with Image.open(io.BytesIO(data)) as im:
r, g, b = im.split()
- im = Image.merge("RGB", (b, g, r))
- assert_image_equal_tofile(im, os.path.join(EXTRA_DIR, "32bpp.png"))
+ im_rgb = Image.merge("RGB", (b, g, r))
+ assert_image_equal_tofile(im_rgb, os.path.join(EXTRA_DIR, "32bpp.png"))
@pytest.mark.skipif(
diff --git a/Tests/test_file_tiff.py b/Tests/test_file_tiff.py
index bd364377b..c6c8467d6 100644
--- a/Tests/test_file_tiff.py
+++ b/Tests/test_file_tiff.py
@@ -764,9 +764,9 @@ class TestFileTiff:
# Test appending images
mp = BytesIO()
- im = Image.new("RGB", (100, 100), "#f00")
+ im_rgb = Image.new("RGB", (100, 100), "#f00")
ims = [Image.new("RGB", (100, 100), color) for color in ["#0f0", "#00f"]]
- im.copy().save(mp, format="TIFF", save_all=True, append_images=ims)
+ im_rgb.copy().save(mp, format="TIFF", save_all=True, append_images=ims)
mp.seek(0, os.SEEK_SET)
with Image.open(mp) as reread:
@@ -778,7 +778,7 @@ class TestFileTiff:
yield from ims
mp = BytesIO()
- im.save(mp, format="TIFF", save_all=True, append_images=im_generator(ims))
+ im_rgb.save(mp, format="TIFF", save_all=True, append_images=im_generator(ims))
mp.seek(0, os.SEEK_SET)
with Image.open(mp) as reread:
@@ -971,6 +971,7 @@ class TestFileTiff:
im = Image.open(tmpfile)
fp = im.fp
+ assert fp is not None
assert not fp.closed
im.load()
assert fp.closed
@@ -984,6 +985,7 @@ class TestFileTiff:
with open(tmpfile, "rb") as f:
im = Image.open(f)
fp = im.fp
+ assert fp is not None
assert not fp.closed
im.load()
assert not fp.closed
@@ -1034,8 +1036,9 @@ class TestFileTiffW32:
im.save(tmpfile)
im = Image.open(tmpfile)
+ assert im.fp is not None
+ assert not im.fp.closed
fp = im.fp
- assert not fp.closed
with pytest.raises(OSError):
os.remove(tmpfile)
im.load()
diff --git a/Tests/test_file_tiff_metadata.py b/Tests/test_file_tiff_metadata.py
index 36ad8cee9..322ef5abc 100644
--- a/Tests/test_file_tiff_metadata.py
+++ b/Tests/test_file_tiff_metadata.py
@@ -175,13 +175,13 @@ def test_change_stripbytecounts_tag_type(tmp_path: Path) -> None:
del info[278]
# Resize the image so that STRIPBYTECOUNTS will be larger than a SHORT
- im = im.resize((500, 500))
- info[TiffImagePlugin.IMAGEWIDTH] = im.width
+ im_resized = im.resize((500, 500))
+ info[TiffImagePlugin.IMAGEWIDTH] = im_resized.width
# STRIPBYTECOUNTS can be a SHORT or a LONG
info.tagtype[TiffImagePlugin.STRIPBYTECOUNTS] = TiffTags.SHORT
- im.save(out, tiffinfo=info)
+ im_resized.save(out, tiffinfo=info)
with Image.open(out) as reloaded:
assert isinstance(reloaded, TiffImagePlugin.TiffImageFile)
diff --git a/Tests/test_file_webp.py b/Tests/test_file_webp.py
index 5456adf59..f996cce67 100644
--- a/Tests/test_file_webp.py
+++ b/Tests/test_file_webp.py
@@ -60,7 +60,6 @@ class TestFileWebp:
assert image.size == (128, 128)
assert image.format == "WEBP"
image.load()
- image.getdata()
# generated with:
# dwebp -ppm ../../Tests/images/hopper.webp -o hopper_webp_bits.ppm
@@ -77,7 +76,6 @@ class TestFileWebp:
assert image.size == (128, 128)
assert image.format == "WEBP"
image.load()
- image.getdata()
if mode == self.rgb_mode:
# generated with: dwebp -ppm temp.webp -o hopper_webp_write.ppm
diff --git a/Tests/test_file_webp_alpha.py b/Tests/test_file_webp_alpha.py
index c573390c4..b1aa45f6b 100644
--- a/Tests/test_file_webp_alpha.py
+++ b/Tests/test_file_webp_alpha.py
@@ -29,7 +29,6 @@ def test_read_rgba() -> None:
assert image.size == (200, 150)
assert image.format == "WEBP"
image.load()
- image.getdata()
image.tobytes()
@@ -60,7 +59,6 @@ def test_write_lossless_rgb(tmp_path: Path) -> None:
assert image.size == pil_image.size
assert image.format == "WEBP"
image.load()
- image.getdata()
assert_image_equal(image, pil_image)
@@ -83,7 +81,6 @@ def test_write_rgba(tmp_path: Path) -> None:
assert image.size == (10, 10)
assert image.format == "WEBP"
image.load()
- image.getdata()
assert_image_similar(image, pil_image, 1.0)
@@ -133,7 +130,6 @@ def test_write_unsupported_mode_PA(tmp_path: Path) -> None:
assert image.format == "WEBP"
image.load()
- image.getdata()
with Image.open(file_path) as im:
target = im.convert("RGBA")
diff --git a/Tests/test_file_webp_lossless.py b/Tests/test_file_webp_lossless.py
index 5eaa4f599..b4c0448ac 100644
--- a/Tests/test_file_webp_lossless.py
+++ b/Tests/test_file_webp_lossless.py
@@ -24,6 +24,5 @@ def test_write_lossless_rgb(tmp_path: Path) -> None:
assert image.size == (128, 128)
assert image.format == "WEBP"
image.load()
- image.getdata()
assert_image_equal(image, hopper(RGB_MODE))
diff --git a/Tests/test_format_lab.py b/Tests/test_format_lab.py
index 4fcc37e88..5f4a704f2 100644
--- a/Tests/test_format_lab.py
+++ b/Tests/test_format_lab.py
@@ -13,15 +13,15 @@ def test_white() -> None:
k = i.getpixel((0, 0))
- L = i.getdata(0)
- a = i.getdata(1)
- b = i.getdata(2)
+ L = i.get_flattened_data(0)
+ a = i.get_flattened_data(1)
+ b = i.get_flattened_data(2)
assert k == (255, 128, 128)
- assert list(L) == [255] * 100
- assert list(a) == [128] * 100
- assert list(b) == [128] * 100
+ assert L == (255,) * 100
+ assert a == (128,) * 100
+ assert b == (128,) * 100
def test_green() -> None:
diff --git a/Tests/test_image.py b/Tests/test_image.py
index ac30f785c..afc6e8e16 100644
--- a/Tests/test_image.py
+++ b/Tests/test_image.py
@@ -613,8 +613,8 @@ class TestImage:
assert im.getpixel((0, 0)) == 0
assert im.getpixel((255, 255)) == 255
with Image.open(target_file) as target:
- target = target.convert(mode)
- assert_image_equal(im, target)
+ im_target = target.convert(mode)
+ assert_image_equal(im, im_target)
def test_radial_gradient_wrong_mode(self) -> None:
# Arrange
@@ -638,8 +638,8 @@ class TestImage:
assert im.getpixel((0, 0)) == 255
assert im.getpixel((128, 128)) == 0
with Image.open(target_file) as target:
- target = target.convert(mode)
- assert_image_equal(im, target)
+ im_target = target.convert(mode)
+ assert_image_equal(im, im_target)
def test_register_extensions(self) -> None:
test_format = "a"
@@ -663,20 +663,20 @@ class TestImage:
assert_image_equal(im, im.remap_palette(list(range(256))))
# Test identity transform with an RGBA palette
- im = Image.new("P", (256, 1))
+ im_p = Image.new("P", (256, 1))
for x in range(256):
- im.putpixel((x, 0), x)
- im.putpalette(list(range(256)) * 4, "RGBA")
- im_remapped = im.remap_palette(list(range(256)))
- assert_image_equal(im, im_remapped)
- assert im.palette is not None
+ im_p.putpixel((x, 0), x)
+ im_p.putpalette(list(range(256)) * 4, "RGBA")
+ im_remapped = im_p.remap_palette(list(range(256)))
+ assert_image_equal(im_p, im_remapped)
+ assert im_p.palette is not None
assert im_remapped.palette is not None
- assert im.palette.palette == im_remapped.palette.palette
+ assert im_p.palette.palette == im_remapped.palette.palette
# Test illegal image mode
- with hopper() as im:
+ with hopper() as im_hopper:
with pytest.raises(ValueError):
- im.remap_palette([])
+ im_hopper.remap_palette([])
def test_remap_palette_transparency(self) -> None:
im = Image.new("P", (1, 2), (0, 0, 0))
@@ -1181,10 +1181,10 @@ class TestImageBytes:
assert reloaded.tobytes() == source_bytes
@pytest.mark.parametrize("mode", Image.MODES)
- def test_getdata_putdata(self, mode: str) -> None:
+ def test_get_flattened_data_putdata(self, mode: str) -> None:
im = hopper(mode)
reloaded = Image.new(mode, im.size)
- reloaded.putdata(im.getdata())
+ reloaded.putdata(im.get_flattened_data())
assert_image_equal(im, reloaded)
diff --git a/Tests/test_image_array.py b/Tests/test_image_array.py
index abb22f949..220e128d1 100644
--- a/Tests/test_image_array.py
+++ b/Tests/test_image_array.py
@@ -78,7 +78,7 @@ def test_fromarray() -> None:
},
)
out = Image.fromarray(wrapped)
- return out.mode, out.size, list(i.getdata()) == list(out.getdata())
+ return out.mode, out.size, i.get_flattened_data() == out.get_flattened_data()
# assert test("1") == ("1", (128, 100), True)
assert test("L") == ("L", (128, 100), True)
diff --git a/Tests/test_image_convert.py b/Tests/test_image_convert.py
index 8d0ef4b22..547a6c2c6 100644
--- a/Tests/test_image_convert.py
+++ b/Tests/test_image_convert.py
@@ -80,8 +80,8 @@ def test_16bit() -> None:
_test_float_conversion(im)
for color in (65535, 65536):
- im = Image.new("I", (1, 1), color)
- im_i16 = im.convert("I;16")
+ im_i = Image.new("I", (1, 1), color)
+ im_i16 = im_i.convert("I;16")
assert im_i16.getpixel((0, 0)) == 65535
diff --git a/Tests/test_image_crop.py b/Tests/test_image_crop.py
index 07fec2e64..9df8883a4 100644
--- a/Tests/test_image_crop.py
+++ b/Tests/test_image_crop.py
@@ -78,13 +78,13 @@ def test_crop_crash() -> None:
extents = (1, 1, 10, 10)
# works prepatch
with Image.open(test_img) as img:
- img2 = img.crop(extents)
- img2.load()
+ img1 = img.crop(extents)
+ img1.load()
# fail prepatch
with Image.open(test_img) as img:
- img = img.crop(extents)
- img.load()
+ img2 = img.crop(extents)
+ img2.load()
def test_crop_zero() -> None:
@@ -95,10 +95,10 @@ def test_crop_zero() -> None:
cropped = im.crop((10, 10, 20, 20))
assert cropped.size == (10, 10)
- assert cropped.getdata()[0] == (0, 0, 0)
+ assert cropped.getpixel((0, 0)) == (0, 0, 0)
im = Image.new("RGB", (0, 0))
cropped = im.crop((10, 10, 20, 20))
assert cropped.size == (10, 10)
- assert cropped.getdata()[2] == (0, 0, 0)
+ assert cropped.getpixel((2, 0)) == (0, 0, 0)
diff --git a/Tests/test_image_getdata.py b/Tests/test_image_getdata.py
index c8b213d84..94d6cbaa2 100644
--- a/Tests/test_image_getdata.py
+++ b/Tests/test_image_getdata.py
@@ -1,23 +1,23 @@
from __future__ import annotations
+import pytest
+
from PIL import Image
from .helper import hopper
def test_sanity() -> None:
- data = hopper().getdata()
-
- len(data)
- list(data)
+ data = hopper().get_flattened_data()
+ assert len(data) == 128 * 128
assert data[0] == (20, 20, 70)
def test_mode() -> None:
def getdata(mode: str) -> tuple[float | tuple[int, ...] | None, int, int]:
im = hopper(mode).resize((32, 30), Image.Resampling.NEAREST)
- data = im.getdata()
+ data = im.get_flattened_data()
return data[0], len(data), len(list(data))
assert getdata("1") == (0, 960, 960)
@@ -28,3 +28,13 @@ def test_mode() -> None:
assert getdata("RGBA") == ((11, 13, 52, 255), 960, 960)
assert getdata("CMYK") == ((244, 242, 203, 0), 960, 960)
assert getdata("YCbCr") == ((16, 147, 123), 960, 960)
+
+
+def test_deprecation() -> None:
+ im = hopper()
+ with pytest.warns(DeprecationWarning, match="getdata"):
+ data = im.getdata()
+
+ assert len(data) == 128 * 128
+ assert data[0] == (20, 20, 70)
+ assert list(data)[0] == (20, 20, 70)
diff --git a/Tests/test_image_load.py b/Tests/test_image_load.py
index 4f1d63b8f..1d5f0d17c 100644
--- a/Tests/test_image_load.py
+++ b/Tests/test_image_load.py
@@ -38,6 +38,7 @@ def test_close_after_load(caplog: pytest.LogCaptureFixture) -> None:
def test_contextmanager() -> None:
fn = None
with Image.open("Tests/images/hopper.gif") as im:
+ assert im.fp is not None
fn = im.fp.fileno()
os.fstat(fn)
diff --git a/Tests/test_image_putdata.py b/Tests/test_image_putdata.py
index bf8e89b53..226cb4c14 100644
--- a/Tests/test_image_putdata.py
+++ b/Tests/test_image_putdata.py
@@ -2,6 +2,7 @@ from __future__ import annotations
import sys
from array import array
+from typing import cast
import pytest
@@ -12,21 +13,19 @@ from .helper import assert_image_equal, hopper
def test_sanity() -> None:
im1 = hopper()
+ for data in (im1.get_flattened_data(), im1.im):
+ im2 = Image.new(im1.mode, im1.size, 0)
+ im2.putdata(data)
- data = list(im1.getdata())
+ assert_image_equal(im1, im2)
- im2 = Image.new(im1.mode, im1.size, 0)
- im2.putdata(data)
+ # readonly
+ im2 = Image.new(im1.mode, im2.size, 0)
+ im2.readonly = 1
+ im2.putdata(data)
- assert_image_equal(im1, im2)
-
- # readonly
- im2 = Image.new(im1.mode, im2.size, 0)
- im2.readonly = 1
- im2.putdata(data)
-
- assert not im2.readonly
- assert_image_equal(im1, im2)
+ assert not im2.readonly
+ assert_image_equal(im1, im2)
def test_long_integers() -> None:
@@ -60,22 +59,22 @@ def test_mode_with_L_with_float() -> None:
@pytest.mark.parametrize("mode", ("I", "I;16", "I;16L", "I;16B"))
def test_mode_i(mode: str) -> None:
src = hopper("L")
- data = list(src.getdata())
+ data = src.get_flattened_data()
im = Image.new(mode, src.size, 0)
im.putdata(data, 2, 256)
- target = [2 * elt + 256 for elt in data]
- assert list(im.getdata()) == target
+ target = tuple(2 * elt + 256 for elt in cast(tuple[int, ...], data))
+ assert im.get_flattened_data() == target
def test_mode_F() -> None:
src = hopper("L")
- data = list(src.getdata())
+ data = src.get_flattened_data()
im = Image.new("F", src.size, 0)
im.putdata(data, 2.0, 256.0)
- target = [2.0 * float(elt) + 256.0 for elt in data]
- assert list(im.getdata()) == target
+ target = tuple(2.0 * float(elt) + 256.0 for elt in cast(tuple[int, ...], data))
+ assert im.get_flattened_data() == target
def test_array_B() -> None:
@@ -86,7 +85,7 @@ def test_array_B() -> None:
im = Image.new("L", (150, 100))
im.putdata(arr)
- assert len(im.getdata()) == len(arr)
+ assert len(im.get_flattened_data()) == len(arr)
def test_array_F() -> None:
@@ -97,7 +96,7 @@ def test_array_F() -> None:
arr = array("f", [0.0]) * 15000
im.putdata(arr)
- assert len(im.getdata()) == len(arr)
+ assert len(im.get_flattened_data()) == len(arr)
def test_not_flattened() -> None:
diff --git a/Tests/test_image_quantize.py b/Tests/test_image_quantize.py
index e8b783ff3..887628560 100644
--- a/Tests/test_image_quantize.py
+++ b/Tests/test_image_quantize.py
@@ -58,8 +58,8 @@ def test_rgba_quantize() -> None:
def test_quantize() -> None:
with Image.open("Tests/images/caption_6_33_22.png") as image:
- image = image.convert("RGB")
- converted = image.quantize()
+ converted = image.convert("RGB")
+ converted = converted.quantize()
assert converted.mode == "P"
assert_image_similar(converted.convert("RGB"), image, 1)
@@ -67,13 +67,13 @@ def test_quantize() -> None:
def test_quantize_no_dither() -> None:
image = hopper()
with Image.open("Tests/images/caption_6_33_22.png") as palette:
- palette = palette.convert("P")
+ palette_p = palette.convert("P")
- converted = image.quantize(dither=Image.Dither.NONE, palette=palette)
+ converted = image.quantize(dither=Image.Dither.NONE, palette=palette_p)
assert converted.mode == "P"
assert converted.palette is not None
- assert palette.palette is not None
- assert converted.palette.palette == palette.palette.palette
+ assert palette_p.palette is not None
+ assert converted.palette.palette == palette_p.palette.palette
def test_quantize_no_dither2() -> None:
@@ -97,10 +97,10 @@ def test_quantize_no_dither2() -> None:
def test_quantize_dither_diff() -> None:
image = hopper()
with Image.open("Tests/images/caption_6_33_22.png") as palette:
- palette = palette.convert("P")
+ palette_p = palette.convert("P")
- dither = image.quantize(dither=Image.Dither.FLOYDSTEINBERG, palette=palette)
- nodither = image.quantize(dither=Image.Dither.NONE, palette=palette)
+ dither = image.quantize(dither=Image.Dither.FLOYDSTEINBERG, palette=palette_p)
+ nodither = image.quantize(dither=Image.Dither.NONE, palette=palette_p)
assert dither.tobytes() != nodither.tobytes()
diff --git a/Tests/test_image_resize.py b/Tests/test_image_resize.py
index 270500a44..3e8979a5b 100644
--- a/Tests/test_image_resize.py
+++ b/Tests/test_image_resize.py
@@ -160,7 +160,7 @@ class TestImagingCoreResize:
r = self.resize(Image.new("RGB", (0, 0), "white"), (212, 195), resample)
assert r.mode == "RGB"
assert r.size == (212, 195)
- assert r.getdata()[0] == (0, 0, 0)
+ assert r.getpixel((0, 0)) == (0, 0, 0)
def test_unknown_filter(self) -> None:
with pytest.raises(ValueError):
@@ -314,8 +314,8 @@ class TestImageResize:
@skip_unless_feature("libtiff")
def test_transposed(self) -> None:
with Image.open("Tests/images/g4_orientation_5.tif") as im:
- im = im.resize((64, 64))
- assert im.size == (64, 64)
+ im_resized = im.resize((64, 64))
+ assert im_resized.size == (64, 64)
@pytest.mark.parametrize(
"mode", ("L", "RGB", "I", "I;16", "I;16L", "I;16B", "I;16N", "F")
diff --git a/Tests/test_image_rotate.py b/Tests/test_image_rotate.py
index 252a15db7..c3ff52f57 100644
--- a/Tests/test_image_rotate.py
+++ b/Tests/test_image_rotate.py
@@ -43,8 +43,8 @@ def test_angle(angle: int) -> None:
with Image.open("Tests/images/test-card.png") as im:
rotate(im, im.mode, angle)
- im = hopper()
- assert_image_equal(im.rotate(angle), im.rotate(angle, expand=1))
+ im_hopper = hopper()
+ assert_image_equal(im_hopper.rotate(angle), im_hopper.rotate(angle, expand=1))
@pytest.mark.parametrize("angle", (0, 45, 90, 180, 270))
@@ -76,9 +76,9 @@ def test_center_0() -> None:
with Image.open("Tests/images/hopper_45.png") as target:
target_origin = target.size[1] / 2
- target = target.crop((0, target_origin, 128, target_origin + 128))
+ im_target = target.crop((0, target_origin, 128, target_origin + 128))
- assert_image_similar(im, target, 15)
+ assert_image_similar(im, im_target, 15)
def test_center_14() -> None:
@@ -87,22 +87,22 @@ def test_center_14() -> None:
with Image.open("Tests/images/hopper_45.png") as target:
target_origin = target.size[1] / 2 - 14
- target = target.crop((6, target_origin, 128 + 6, target_origin + 128))
+ im_target = target.crop((6, target_origin, 128 + 6, target_origin + 128))
- assert_image_similar(im, target, 10)
+ assert_image_similar(im, im_target, 10)
def test_translate() -> None:
im = hopper()
with Image.open("Tests/images/hopper_45.png") as target:
target_origin = (target.size[1] / 2 - 64) - 5
- target = target.crop(
+ im_target = target.crop(
(target_origin, target_origin, target_origin + 128, target_origin + 128)
)
im = im.rotate(45, translate=(5, 5), resample=Image.Resampling.BICUBIC)
- assert_image_similar(im, target, 1)
+ assert_image_similar(im, im_target, 1)
def test_fastpath_center() -> None:
diff --git a/Tests/test_image_thumbnail.py b/Tests/test_image_thumbnail.py
index 1181f6fca..2ae230f3d 100644
--- a/Tests/test_image_thumbnail.py
+++ b/Tests/test_image_thumbnail.py
@@ -159,9 +159,9 @@ def test_reducing_gap_for_DCT_scaling() -> None:
with Image.open("Tests/images/hopper.jpg") as ref:
# thumbnail should call draft with reducing_gap scale
ref.draft(None, (18 * 3, 18 * 3))
- ref = ref.resize((18, 18), Image.Resampling.BICUBIC)
+ im_ref = ref.resize((18, 18), Image.Resampling.BICUBIC)
with Image.open("Tests/images/hopper.jpg") as im:
im.thumbnail((18, 18), Image.Resampling.BICUBIC, reducing_gap=3.0)
- assert_image_similar(ref, im, 1.4)
+ assert_image_similar(im_ref, im, 1.4)
diff --git a/Tests/test_image_transform.py b/Tests/test_image_transform.py
index 7cf52ddba..3e2b9fee8 100644
--- a/Tests/test_image_transform.py
+++ b/Tests/test_image_transform.py
@@ -250,14 +250,14 @@ class TestImageTransform:
def test_missing_method_data(self) -> None:
with hopper() as im:
with pytest.raises(ValueError):
- im.transform((100, 100), None)
+ im.transform((100, 100), None) # type: ignore[arg-type]
@pytest.mark.parametrize("resample", (Image.Resampling.BOX, "unknown"))
def test_unknown_resampling_filter(self, resample: Image.Resampling | str) -> None:
with hopper() as im:
(w, h) = im.size
with pytest.raises(ValueError):
- im.transform((100, 100), Image.Transform.EXTENT, (0, 0, w, h), resample)
+ im.transform((100, 100), Image.Transform.EXTENT, (0, 0, w, h), resample) # type: ignore[arg-type]
class TestImageTransformAffine:
diff --git a/Tests/test_imagecms.py b/Tests/test_imagecms.py
index 5fd7caa7c..a30fb18b8 100644
--- a/Tests/test_imagecms.py
+++ b/Tests/test_imagecms.py
@@ -274,13 +274,13 @@ def test_simple_lab() -> None:
# not a linear luminance map. so L != 128:
assert k == (137, 128, 128)
- l_data = i_lab.getdata(0)
- a_data = i_lab.getdata(1)
- b_data = i_lab.getdata(2)
+ l_data = i_lab.get_flattened_data(0)
+ a_data = i_lab.get_flattened_data(1)
+ b_data = i_lab.get_flattened_data(2)
- assert list(l_data) == [137] * 100
- assert list(a_data) == [128] * 100
- assert list(b_data) == [128] * 100
+ assert l_data == (137,) * 100
+ assert a_data == (128,) * 100
+ assert b_data == (128,) * 100
def test_lab_color() -> None:
diff --git a/Tests/test_imagedraw.py b/Tests/test_imagedraw.py
index 1e0dedef3..44aec4a9e 100644
--- a/Tests/test_imagedraw.py
+++ b/Tests/test_imagedraw.py
@@ -208,10 +208,10 @@ def test_bitmap() -> None:
im = Image.new("RGB", (W, H))
draw = ImageDraw.Draw(im)
with Image.open("Tests/images/pil123rgba.png") as small:
- small = small.resize((50, 50), Image.Resampling.NEAREST)
+ small_resized = small.resize((50, 50), Image.Resampling.NEAREST)
# Act
- draw.bitmap((10, 10), small)
+ draw.bitmap((10, 10), small_resized)
# Assert
assert_image_equal_tofile(im, "Tests/images/imagedraw_bitmap.png")
diff --git a/Tests/test_imagefont.py b/Tests/test_imagefont.py
index 39ee9b9c9..d0b458d6b 100644
--- a/Tests/test_imagefont.py
+++ b/Tests/test_imagefont.py
@@ -702,7 +702,7 @@ def test_variation_get(font: ImageFont.FreeTypeFont) -> None:
font.get_variation_axes()
font = ImageFont.truetype("Tests/fonts/AdobeVFPrototype.ttf")
- assert font.get_variation_names(), [
+ assert font.get_variation_names() == [
b"ExtraLight",
b"Light",
b"Regular",
@@ -742,6 +742,21 @@ def test_variation_get(font: ImageFont.FreeTypeFont) -> None:
]
+def test_variation_duplicates() -> None:
+ font = ImageFont.truetype("Tests/fonts/AdobeVFPrototypeDuplicates.ttf")
+ assert font.get_variation_names() == [
+ b"ExtraLight",
+ b"Light",
+ b"Regular",
+ b"Semibold",
+ b"Bold",
+ b"Black",
+ b"Black Medium Contrast",
+ b"Black High Contrast",
+ b"Default",
+ ]
+
+
def _check_text(font: ImageFont.FreeTypeFont, path: str, epsilon: float) -> None:
im = Image.new("RGB", (100, 75), "white")
d = ImageDraw.Draw(im)
diff --git a/Tests/test_imagemorph.py b/Tests/test_imagemorph.py
index ca192a809..daba30015 100644
--- a/Tests/test_imagemorph.py
+++ b/Tests/test_imagemorph.py
@@ -15,13 +15,10 @@ def string_to_img(image_string: str) -> Image.Image:
rows = [s for s in image_string.replace(" ", "").split("\n") if len(s)]
height = len(rows)
width = len(rows[0])
- im = Image.new("L", (width, height))
- for i in range(width):
- for j in range(height):
- c = rows[j][i]
- v = c in "X1"
- im.putpixel((i, j), v)
-
+ im = Image.new("1", (width, height))
+ for x in range(width):
+ for y in range(height):
+ im.putpixel((x, y), rows[y][x] in "X1")
return im
@@ -42,10 +39,10 @@ def img_to_string(im: Image.Image) -> str:
"""Turn a (small) binary image into a string representation"""
chars = ".1"
result = []
- for r in range(im.height):
+ for y in range(im.height):
line = ""
- for c in range(im.width):
- value = im.getpixel((c, r))
+ for x in range(im.width):
+ value = im.getpixel((x, y))
assert not isinstance(value, tuple)
assert value is not None
line += chars[value > 0]
@@ -165,10 +162,12 @@ def test_edge() -> None:
)
-def test_corner() -> None:
+@pytest.mark.parametrize("mode", ("1", "L"))
+def test_corner(mode: str) -> None:
# Create a corner detector pattern
mop = ImageMorph.MorphOp(patterns=["1:(... ... ...)->0", "4:(00. 01. ...)->1"])
- count, Aout = mop.apply(A)
+ image = A.convert(mode) if mode == "L" else A
+ count, Aout = mop.apply(image)
assert count == 5
assert_img_equal_img_string(
Aout,
@@ -184,7 +183,7 @@ def test_corner() -> None:
)
# Test the coordinate counting with the same operator
- coords = mop.match(A)
+ coords = mop.match(image)
assert len(coords) == 4
assert tuple(coords) == ((2, 2), (4, 2), (2, 4), (4, 4))
@@ -232,14 +231,14 @@ def test_negate() -> None:
def test_incorrect_mode() -> None:
- im = hopper("RGB")
+ im = hopper()
mop = ImageMorph.MorphOp(op_name="erosion8")
- with pytest.raises(ValueError, match="Image mode must be L"):
+ with pytest.raises(ValueError, match="Image mode must be 1 or L"):
mop.apply(im)
- with pytest.raises(ValueError, match="Image mode must be L"):
+ with pytest.raises(ValueError, match="Image mode must be 1 or L"):
mop.match(im)
- with pytest.raises(ValueError, match="Image mode must be L"):
+ with pytest.raises(ValueError, match="Image mode must be 1 or L"):
mop.get_on_pixels(im)
@@ -281,6 +280,11 @@ def test_pattern_syntax_error(pattern: str) -> None:
lb.build_lut()
+def test_build_default_lut() -> None:
+ lb = ImageMorph.LutBuilder(op_name="corner")
+ assert lb.build_default_lut() == lb.lut
+
+
def test_load_invalid_mrl() -> None:
# Arrange
invalid_mrl = "Tests/images/hopper.png"
diff --git a/Tests/test_imageops.py b/Tests/test_imageops.py
index 27ac6f308..35fe3bb8a 100644
--- a/Tests/test_imageops.py
+++ b/Tests/test_imageops.py
@@ -261,10 +261,10 @@ def test_colorize_2color() -> None:
# Open test image (256px by 10px, black to white)
with Image.open("Tests/images/bw_gradient.png") as im:
- im = im.convert("L")
+ im_l = im.convert("L")
# Create image with original 2-color functionality
- im_test = ImageOps.colorize(im, "red", "green")
+ im_test = ImageOps.colorize(im_l, "red", "green")
# Test output image (2-color)
left = (0, 1)
@@ -301,11 +301,11 @@ def test_colorize_2color_offset() -> None:
# Open test image (256px by 10px, black to white)
with Image.open("Tests/images/bw_gradient.png") as im:
- im = im.convert("L")
+ im_l = im.convert("L")
# Create image with original 2-color functionality with offsets
im_test = ImageOps.colorize(
- im, black="red", white="green", blackpoint=50, whitepoint=100
+ im_l, black="red", white="green", blackpoint=50, whitepoint=100
)
# Test output image (2-color) with offsets
@@ -343,11 +343,11 @@ def test_colorize_3color_offset() -> None:
# Open test image (256px by 10px, black to white)
with Image.open("Tests/images/bw_gradient.png") as im:
- im = im.convert("L")
+ im_l = im.convert("L")
# Create image with new three color functionality with offsets
im_test = ImageOps.colorize(
- im,
+ im_l,
black="red",
white="green",
mid="blue",
@@ -457,9 +457,9 @@ def test_exif_transpose() -> None:
assert 0x0112 not in transposed_im.getexif()
# Orientation set directly on Image.Exif
- im = hopper()
- im.getexif()[0x0112] = 3
- transposed_im = ImageOps.exif_transpose(im)
+ im1 = hopper()
+ im1.getexif()[0x0112] = 3
+ transposed_im = ImageOps.exif_transpose(im1)
assert 0x0112 not in transposed_im.getexif()
diff --git a/Tests/test_imagepalette.py b/Tests/test_imagepalette.py
index 782022f51..6ad21502f 100644
--- a/Tests/test_imagepalette.py
+++ b/Tests/test_imagepalette.py
@@ -49,6 +49,12 @@ def test_getcolor() -> None:
palette.getcolor("unknown") # type: ignore[arg-type]
+def test_getcolor_rgba() -> None:
+ palette = ImagePalette.ImagePalette("RGBA", (1, 2, 3, 4))
+ palette.getcolor((5, 6, 7, 8))
+ assert palette.palette == b"\x01\x02\x03\x04\x05\x06\x07\x08"
+
+
def test_getcolor_rgba_color_rgb_palette() -> None:
palette = ImagePalette.ImagePalette("RGB")
diff --git a/Tests/test_imagetext.py b/Tests/test_imagetext.py
index 46afea064..2b424629d 100644
--- a/Tests/test_imagetext.py
+++ b/Tests/test_imagetext.py
@@ -2,7 +2,7 @@ from __future__ import annotations
import pytest
-from PIL import Image, ImageDraw, ImageFont, ImageText
+from PIL import Image, ImageDraw, ImageFont, ImageText, features
from .helper import assert_image_similar_tofile, skip_unless_feature
@@ -20,42 +20,69 @@ def layout_engine(request: pytest.FixtureRequest) -> ImageFont.Layout:
return request.param
-@pytest.fixture(scope="module")
-def font(layout_engine: ImageFont.Layout) -> ImageFont.FreeTypeFont:
- return ImageFont.truetype(FONT_PATH, 20, layout_engine=layout_engine)
+@pytest.fixture(
+ scope="module",
+ params=[
+ None,
+ pytest.param(ImageFont.Layout.BASIC, marks=skip_unless_feature("freetype2")),
+ pytest.param(ImageFont.Layout.RAQM, marks=skip_unless_feature("raqm")),
+ ],
+)
+def font(
+ request: pytest.FixtureRequest,
+) -> ImageFont.ImageFont | ImageFont.FreeTypeFont:
+ layout_engine = request.param
+ if layout_engine is None:
+ return ImageFont.load_default_imagefont()
+ else:
+ return ImageFont.truetype(FONT_PATH, 20, layout_engine=layout_engine)
-def test_get_length(font: ImageFont.FreeTypeFont) -> None:
- assert ImageText.Text("A", font).get_length() == 12
- assert ImageText.Text("AB", font).get_length() == 24
- assert ImageText.Text("M", font).get_length() == 12
- assert ImageText.Text("y", font).get_length() == 12
- assert ImageText.Text("a", font).get_length() == 12
+def test_get_length(font: ImageFont.ImageFont | ImageFont.FreeTypeFont) -> None:
+ factor = 1 if isinstance(font, ImageFont.ImageFont) else 2
+ assert ImageText.Text("A", font).get_length() == 6 * factor
+ assert ImageText.Text("AB", font).get_length() == 12 * factor
+ assert ImageText.Text("M", font).get_length() == 6 * factor
+ assert ImageText.Text("y", font).get_length() == 6 * factor
+ assert ImageText.Text("a", font).get_length() == 6 * factor
text = ImageText.Text("\n", font)
with pytest.raises(ValueError, match="can't measure length of multiline text"):
text.get_length()
-def test_get_bbox(font: ImageFont.FreeTypeFont) -> None:
- assert ImageText.Text("A", font).get_bbox() == (0, 4, 12, 16)
- assert ImageText.Text("AB", font).get_bbox() == (0, 4, 24, 16)
- assert ImageText.Text("M", font).get_bbox() == (0, 4, 12, 16)
- assert ImageText.Text("y", font).get_bbox() == (0, 7, 12, 20)
- assert ImageText.Text("a", font).get_bbox() == (0, 7, 12, 16)
+@pytest.mark.parametrize(
+ "text, expected",
+ (
+ ("A", (0, 4, 12, 16)),
+ ("AB", (0, 4, 24, 16)),
+ ("M", (0, 4, 12, 16)),
+ ("y", (0, 7, 12, 20)),
+ ("a", (0, 7, 12, 16)),
+ ),
+)
+def test_get_bbox(
+ font: ImageFont.ImageFont | ImageFont.FreeTypeFont,
+ text: str,
+ expected: tuple[int, int, int, int],
+) -> None:
+ if isinstance(font, ImageFont.ImageFont):
+ expected = (0, 0, expected[2] // 2, 11)
+ assert ImageText.Text(text, font).get_bbox() == expected
def test_standard_embedded_color(layout_engine: ImageFont.Layout) -> None:
- font = ImageFont.truetype(FONT_PATH, 40, layout_engine=layout_engine)
- text = ImageText.Text("Hello World!", font)
- text.embed_color()
- assert text.get_length() == 288
+ if features.check_module("freetype2"):
+ font = ImageFont.truetype(FONT_PATH, 40, layout_engine=layout_engine)
+ text = ImageText.Text("Hello World!", font)
+ text.embed_color()
+ assert text.get_length() == 288
- im = Image.new("RGB", (300, 64), "white")
- draw = ImageDraw.Draw(im)
- draw.text((10, 10), text, "#fa6")
+ im = Image.new("RGB", (300, 64), "white")
+ draw = ImageDraw.Draw(im)
+ draw.text((10, 10), text, "#fa6")
- assert_image_similar_tofile(im, "Tests/images/standard_embedded.png", 3.1)
+ assert_image_similar_tofile(im, "Tests/images/standard_embedded.png", 3.1)
text = ImageText.Text("", mode="1")
with pytest.raises(
diff --git a/Tests/test_numpy.py b/Tests/test_numpy.py
index f6acb3aff..113d30755 100644
--- a/Tests/test_numpy.py
+++ b/Tests/test_numpy.py
@@ -20,21 +20,19 @@ TEST_IMAGE_SIZE = (10, 10)
def test_numpy_to_image() -> None:
def to_image(dtype: npt.DTypeLike, bands: int = 1, boolean: int = 0) -> Image.Image:
+ data = tuple(range(100))
if bands == 1:
if boolean:
- data = [0, 255] * 50
- else:
- data = list(range(100))
+ data = (0, 255) * 50
a = numpy.array(data, dtype=dtype)
a.shape = TEST_IMAGE_SIZE
i = Image.fromarray(a)
- assert list(i.getdata()) == data
+ assert i.get_flattened_data() == data
else:
- data = list(range(100))
a = numpy.array([[x] * bands for x in data], dtype=dtype)
a.shape = TEST_IMAGE_SIZE[0], TEST_IMAGE_SIZE[1], bands
i = Image.fromarray(a)
- assert list(i.getchannel(0).getdata()) == list(range(100))
+ assert i.get_flattened_data(0) == tuple(range(100))
return i
# Check supported 1-bit integer formats
@@ -191,7 +189,7 @@ def test_putdata() -> None:
arr = numpy.zeros((15000,), numpy.float32)
im.putdata(arr)
- assert len(im.getdata()) == len(arr)
+ assert len(im.get_flattened_data()) == len(arr)
def test_resize() -> None:
@@ -248,7 +246,7 @@ def test_bool() -> None:
a[0][0] = True
im2 = Image.fromarray(a)
- assert im2.getdata()[0] == 255
+ assert im2.getpixel((0, 0)) == 255
def test_no_resource_warning_for_numpy_array() -> None:
diff --git a/Tests/test_pickle.py b/Tests/test_pickle.py
index 54cef00ad..2447ae67a 100644
--- a/Tests/test_pickle.py
+++ b/Tests/test_pickle.py
@@ -19,30 +19,28 @@ def helper_pickle_file(
# Arrange
with Image.open(test_file) as im:
filename = tmp_path / "temp.pkl"
- if mode:
- im = im.convert(mode)
+ converted_im = im.convert(mode) if mode else im
# Act
with open(filename, "wb") as f:
- pickle.dump(im, f, protocol)
+ pickle.dump(converted_im, f, protocol)
with open(filename, "rb") as f:
loaded_im = pickle.load(f)
# Assert
- assert im == loaded_im
+ assert converted_im == loaded_im
def helper_pickle_string(protocol: int, test_file: str, mode: str | None) -> None:
with Image.open(test_file) as im:
- if mode:
- im = im.convert(mode)
+ converted_im = im.convert(mode) if mode else im
# Act
- dumped_string = pickle.dumps(im, protocol)
+ dumped_string = pickle.dumps(converted_im, protocol)
loaded_im = pickle.loads(dumped_string)
# Assert
- assert im == loaded_im
+ assert converted_im == loaded_im
@pytest.mark.parametrize(
@@ -90,18 +88,18 @@ def test_pickle_la_mode_with_palette(tmp_path: Path) -> None:
# Arrange
filename = tmp_path / "temp.pkl"
with Image.open("Tests/images/hopper.jpg") as im:
- im = im.convert("PA")
+ im_pa = im.convert("PA")
# Act / Assert
for protocol in range(pickle.HIGHEST_PROTOCOL + 1):
- im._mode = "LA"
+ im_pa._mode = "LA"
with open(filename, "wb") as f:
- pickle.dump(im, f, protocol)
+ pickle.dump(im_pa, f, protocol)
with open(filename, "rb") as f:
loaded_im = pickle.load(f)
- im._mode = "PA"
- assert im == loaded_im
+ im_pa._mode = "PA"
+ assert im_pa == loaded_im
@skip_unless_feature("webp")
diff --git a/Tests/test_shell_injection.py b/Tests/test_shell_injection.py
index 465517bb6..a7e95ed83 100644
--- a/Tests/test_shell_injection.py
+++ b/Tests/test_shell_injection.py
@@ -49,11 +49,13 @@ class TestShellInjection:
@pytest.mark.skipif(not netpbm_available(), reason="Netpbm not available")
def test_save_netpbm_filename_bmp_mode(self, tmp_path: Path) -> None:
with Image.open(TEST_GIF) as im:
- im = im.convert("RGB")
- self.assert_save_filename_check(tmp_path, im, GifImagePlugin._save_netpbm)
+ im_rgb = im.convert("RGB")
+ self.assert_save_filename_check(
+ tmp_path, im_rgb, GifImagePlugin._save_netpbm
+ )
@pytest.mark.skipif(not netpbm_available(), reason="Netpbm not available")
def test_save_netpbm_filename_l_mode(self, tmp_path: Path) -> None:
with Image.open(TEST_GIF) as im:
- im = im.convert("L")
- self.assert_save_filename_check(tmp_path, im, GifImagePlugin._save_netpbm)
+ im_l = im.convert("L")
+ self.assert_save_filename_check(tmp_path, im_l, GifImagePlugin._save_netpbm)
diff --git a/depends/install_imagequant.sh b/depends/install_imagequant.sh
index 357214f1f..de63abdec 100755
--- a/depends/install_imagequant.sh
+++ b/depends/install_imagequant.sh
@@ -2,7 +2,7 @@
# install libimagequant
archive_name=libimagequant
-archive_version=4.4.0
+archive_version=4.4.1
archive=$archive_name-$archive_version
diff --git a/docs/deprecations.rst b/docs/deprecations.rst
index cc5ac283f..b6a7af0a8 100644
--- a/docs/deprecations.rst
+++ b/docs/deprecations.rst
@@ -73,6 +73,16 @@ Image._show
``Image._show`` has been deprecated, and will be removed in Pillow 13 (2026-10-15).
Use :py:meth:`~PIL.ImageShow.show` instead.
+Image getdata()
+~~~~~~~~~~~~~~~
+
+.. deprecated:: 12.1.0
+
+:py:meth:`~PIL.Image.Image.getdata` has been deprecated.
+:py:meth:`~PIL.Image.Image.get_flattened_data` can be used instead. This new method is
+identical, except that it returns a tuple of pixel values, instead of an internal
+Pillow data type.
+
Removed features
----------------
diff --git a/docs/example/DdsImagePlugin.py b/docs/example/DdsImagePlugin.py
index e4b6b9c01..e0557976c 100644
--- a/docs/example/DdsImagePlugin.py
+++ b/docs/example/DdsImagePlugin.py
@@ -213,6 +213,7 @@ class DdsImageFile(ImageFile.ImageFile):
format_description = "DirectDraw Surface"
def _open(self) -> None:
+ assert self.fp is not None
if not _accept(self.fp.read(4)):
msg = "not a DDS file"
raise SyntaxError(msg)
diff --git a/docs/handbook/image-file-formats.rst b/docs/handbook/image-file-formats.rst
index 03ee96c0f..35ec99ece 100644
--- a/docs/handbook/image-file-formats.rst
+++ b/docs/handbook/image-file-formats.rst
@@ -999,7 +999,7 @@ where applicable:
The number of times to loop this APNG, 0 indicates infinite looping.
**duration**
- The time to display this APNG frame (in milliseconds).
+ The time to display this APNG frame (in milliseconds), given as a float.
.. note::
@@ -1041,9 +1041,8 @@ following parameters can also be set:
Defaults to 0.
**duration**
- Integer (or list or tuple of integers) length of time to display this APNG frame
- (in milliseconds).
- Defaults to 0.
+ The length of time (or list or tuple of lengths of time) to display this APNG frame
+ (in milliseconds). Defaults to 0.
**disposal**
An integer (or list or tuple of integers) specifying the APNG disposal
diff --git a/docs/installation/building-from-source.rst b/docs/installation/building-from-source.rst
index 40e2a1938..c86ebe896 100644
--- a/docs/installation/building-from-source.rst
+++ b/docs/installation/building-from-source.rst
@@ -64,7 +64,7 @@ Many of Pillow's features require external libraries:
* **libimagequant** provides improved color quantization
- * Pillow has been tested with libimagequant **2.6-4.4.0**
+ * Pillow has been tested with libimagequant **2.6-4.4.1**
* Libimagequant is licensed GPLv3, which is more restrictive than
the Pillow license, therefore we will not be distributing binaries
with libimagequant support enabled.
diff --git a/docs/installation/platform-support.rst b/docs/installation/platform-support.rst
index 17e38719a..ee70d8401 100644
--- a/docs/installation/platform-support.rst
+++ b/docs/installation/platform-support.rst
@@ -53,8 +53,8 @@ These platforms are built and tested for every change.
| | | s390x |
+----------------------------------+----------------------------+---------------------+
| Windows Server 2022 | 3.10 | x86 |
-| +----------------------------+---------------------+
-| | 3.11, 3.12, 3.13, 3.14, | x86-64 |
++----------------------------------+----------------------------+---------------------+
+| Windows Server 2025 | 3.11, 3.12, 3.13, 3.14, | x86-64 |
| | PyPy3 | |
| +----------------------------+---------------------+
| | 3.12 (MinGW) | x86-64 |
diff --git a/docs/reference/Image.rst b/docs/reference/Image.rst
index e68722900..adee49228 100644
--- a/docs/reference/Image.rst
+++ b/docs/reference/Image.rst
@@ -191,6 +191,7 @@ This helps to get the bounding box coordinates of the input image::
.. automethod:: PIL.Image.Image.getchannel
.. automethod:: PIL.Image.Image.getcolors
.. automethod:: PIL.Image.Image.getdata
+.. automethod:: PIL.Image.Image.get_flattened_data
.. automethod:: PIL.Image.Image.getexif
.. automethod:: PIL.Image.Image.getextrema
.. automethod:: PIL.Image.Image.getpalette
diff --git a/docs/reference/ImageGrab.rst b/docs/reference/ImageGrab.rst
index 5c3a73fad..413866785 100644
--- a/docs/reference/ImageGrab.rst
+++ b/docs/reference/ImageGrab.rst
@@ -44,9 +44,11 @@ or the clipboard to a PIL image memory.
.. versionadded:: 7.1.0
:param window:
- HWND, to capture a single window. Windows only.
+ Capture a single window. On Windows, this is a HWND. On macOS, this is a
+ CGWindowID.
- .. versionadded:: 11.2.1
+ .. versionadded:: 11.2.1 Windows support
+ .. versionadded:: 12.1.0 macOS support
:return: An image
.. py:function:: grabclipboard()
diff --git a/docs/reference/ImageMorph.rst b/docs/reference/ImageMorph.rst
index 30b89a54d..f7a302713 100644
--- a/docs/reference/ImageMorph.rst
+++ b/docs/reference/ImageMorph.rst
@@ -4,10 +4,50 @@
:py:mod:`~PIL.ImageMorph` module
================================
-The :py:mod:`~PIL.ImageMorph` module provides morphology operations on images.
+The :py:mod:`~PIL.ImageMorph` module allows `morphology`_ operators ("MorphOp") to be
+applied to 1 or L mode images::
-.. automodule:: PIL.ImageMorph
+ from PIL import Image, ImageMorph
+ img = Image.open("Tests/images/hopper.bw")
+ mop = ImageMorph.MorphOp(op_name="erosion4")
+ count, imgOut = mop.apply(img)
+ imgOut.show()
+
+.. _morphology: https://en.wikipedia.org/wiki/Mathematical_morphology
+
+In addition to applying operators, you can also analyse images.
+
+You can inspect an image in isolation to determine which pixels are non-empty::
+
+ print(mop.get_on_pixels(img)) # [(0, 0), (1, 0), (2, 0), ...]
+
+Or you can retrieve a list of pixels that match the operator. This is the number of
+pixels that will be non-empty after the operator is applied::
+
+ coords = mop.match(img)
+ print(coords) # [(17, 1), (18, 1), (34, 1), ...]
+ print(len(coords)) # 550
+
+ imgOut = mop.apply(img)[1]
+ print(len(mop.get_on_pixels(imgOut))) # 550
+
+If you would like more customized operators, you can pass patterns to the MorphOp
+class::
+
+ mop = ImageMorph.MorphOp(patterns=["1:(... ... ...)->0", "4:(00. 01. ...)->1"])
+
+Or you can pass lookup table ("LUT") data directly. This LUT data can be constructed
+with the :py:class:`~PIL.ImageMorph.LutBuilder`::
+
+ builder = ImageMorph.LutBuilder()
+ mop = ImageMorph.MorphOp(lut=builder.build_lut())
+
+.. autoclass:: LutBuilder
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+.. autoclass:: MorphOp
:members:
:undoc-members:
:show-inheritance:
- :noindex:
diff --git a/docs/releasenotes/12.1.0.rst b/docs/releasenotes/12.1.0.rst
new file mode 100644
index 000000000..9740b7008
--- /dev/null
+++ b/docs/releasenotes/12.1.0.rst
@@ -0,0 +1,49 @@
+12.1.0
+------
+
+Deprecations
+============
+
+Image getdata()
+^^^^^^^^^^^^^^^
+
+:py:meth:`~PIL.Image.Image.getdata` has been deprecated.
+:py:meth:`~PIL.Image.Image.get_flattened_data` can be used instead. This new method is
+identical, except that it returns a tuple of pixel values, instead of an internal
+Pillow data type.
+
+API changes
+===========
+
+ImageMorph build_default_lut()
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+To match the behaviour of :py:meth:`~PIL.ImageMorph.LutBuilder.build_lut`,
+:py:meth:`~PIL.ImageMorph.LutBuilder.build_default_lut()` now returns the new LUT.
+
+API additions
+=============
+
+Image get_flattened_data()
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+:py:meth:`~PIL.Image.Image.get_flattened_data` is identical to the deprecated
+:py:meth:`~PIL.Image.Image.getdata`, except that the new method returns a tuple of
+pixel values, instead of an internal Pillow data type.
+
+Specify window in ImageGrab on macOS
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+When using :py:meth:`~PIL.ImageGrab.grab`, a specific window can now be selected on
+macOS in addition to Windows. On macOS, this is a CGWindowID::
+
+ from PIL import ImageGrab
+ ImageGrab.grab(window=cgwindowid)
+
+Other changes
+=============
+
+Added MorphOp support for 1 mode images
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+:py:class:`~PIL.ImageMorph.MorphOp` now supports both 1 mode and L mode images.
diff --git a/docs/releasenotes/index.rst b/docs/releasenotes/index.rst
index f66240c89..4b25bb6a2 100644
--- a/docs/releasenotes/index.rst
+++ b/docs/releasenotes/index.rst
@@ -14,6 +14,8 @@ expected to be backported to earlier versions.
.. toctree::
:maxdepth: 2
+ versioning
+ 12.1.0
12.0.0
11.3.0
11.2.1
@@ -79,4 +81,3 @@ expected to be backported to earlier versions.
2.5.2
2.3.2
2.3.1
- versioning
diff --git a/docs/releasenotes/versioning.rst b/docs/releasenotes/versioning.rst
index 2a0af9e59..884102d16 100644
--- a/docs/releasenotes/versioning.rst
+++ b/docs/releasenotes/versioning.rst
@@ -17,8 +17,8 @@ prior three months.
A quarterly release bumps the MAJOR version when incompatible API changes are
made, such as removing deprecated APIs or dropping an EOL Python version. In practice,
-these occur every 12-18 months, guided by
-`Python's EOL schedule