diff --git a/README.md b/README.md index 10aeedc..3c3e08a 100644 --- a/README.md +++ b/README.md @@ -80,7 +80,17 @@ Bugs - Input images with alpha channels are not allowed. PDF only supports transparency using binary masks but is unable to store 8-bit transparency information as part of the image itself. But img2pdf will always be lossless - and thus, input images must not carry transparency information. + and thus, input images must not carry transparency information. You can + remove the alpha channel for example with imagemagick: + + convert input.png -background white -alpha remove -alpha off output.png + + - An error is produced if the input image is broken. This commonly happens if + the input image has an invalid EXIF Orientation value of zero. Even though + only nine different values from 1 to 9 are permitted, Anroid phones and + Canon DSLR cameras produce JPEG images with the invalid value of zero. + Either fix your input images with `exiftool` or similar software before + passing the JPEG to `img2pdf` or run `img2pdf` with `--rotation=ifvalid`. - img2pdf uses PIL (or Pillow) to obtain image meta data and to convert the input if necessary. To prevent decompression bomb denial of service attacks, diff --git a/src/img2pdf.py b/src/img2pdf.py index 4b8d1c0..8d5f2cf 100755 --- a/src/img2pdf.py +++ b/src/img2pdf.py @@ -2651,7 +2651,6 @@ def gui(): args = { "engine": tkinter.StringVar(), - "first_frame_only": tkinter.BooleanVar(), "auto_orient": tkinter.BooleanVar(), "fit": tkinter.StringVar(), "title": tkinter.StringVar(), @@ -3611,8 +3610,9 @@ ifvalid, 0, 90, 180 and 270. The default value is auto and indicates that input images are rotated according to their EXIF Orientation tag. The values none and 0 ignore the EXIF Orientation values of the input images. The value ifvalid acts like auto but ignores invalid EXIF rotation values and only issues a -warning instead of throwing an error. The values 90, 180 and 270 perform a -clockwise rotation of the image. +warning instead of throwing an error. This is useful because many devices like +Android phones, Canon cameras or scanners emit an invalid Orientation tag value +of zero. The values 90, 180 and 270 perform a clockwise rotation of the image. """, ) sizeargs.add_argument( diff --git a/src/img2pdf_test.py b/src/img2pdf_test.py index 4b3f2e2..bdb8c7d 100755 --- a/src/img2pdf_test.py +++ b/src/img2pdf_test.py @@ -976,10 +976,6 @@ def jpg_img(tmp_path_factory, tmp_normal_png): identify = [identify] assert "image" in identify[0] assert identify[0]["image"].get("format") == "JPEG", str(identify) - assert ( - identify[0]["image"]["formatDescription"] - == "Joint Photographic Experts Group JFIF format" - ), str(identify) assert identify[0]["image"].get("mimeType") == "image/jpeg", str(identify) assert identify[0]["image"].get("geometry") == { "width": 60, @@ -1036,10 +1032,6 @@ def jpg_rot_img(tmp_path_factory, tmp_normal_png): identify = [identify] assert "image" in identify[0] assert identify[0]["image"].get("format") == "JPEG", str(identify) - assert ( - identify[0]["image"]["formatDescription"] - == "Joint Photographic Experts Group JFIF format" - ), str(identify) assert identify[0]["image"].get("mimeType") == "image/jpeg", str(identify) assert identify[0]["image"].get("geometry") == { "width": 60, @@ -1079,10 +1071,6 @@ def jpg_cmyk_img(tmp_path_factory, tmp_normal_png): identify = [identify] assert "image" in identify[0] assert identify[0]["image"].get("format") == "JPEG", str(identify) - assert ( - identify[0]["image"]["formatDescription"] - == "Joint Photographic Experts Group JFIF format" - ), str(identify) assert identify[0]["image"].get("mimeType") == "image/jpeg", str(identify) assert identify[0]["image"].get("geometry") == { "width": 60, @@ -1117,9 +1105,6 @@ def jpg_2000_img(tmp_path_factory, tmp_normal_png): identify = [identify] assert "image" in identify[0] assert identify[0]["image"].get("format") == "JP2", str(identify) - assert ( - identify[0]["image"].get("formatDescription") == "JPEG-2000 File Format Syntax" - ), str(identify) assert identify[0]["image"].get("mimeType") == "image/jp2", str(identify) assert identify[0]["image"].get("geometry") == { "width": 60, @@ -1153,9 +1138,6 @@ def png_rgb8_img(tmp_normal_png): identify = [identify] assert "image" in identify[0] assert identify[0]["image"].get("format") == "PNG", str(identify) - assert ( - identify[0]["image"].get("formatDescription") == "Portable Network Graphics" - ), str(identify) assert identify[0]["image"].get("mimeType") == "image/png", str(identify) assert identify[0]["image"].get("geometry") == { "width": 60, @@ -1206,9 +1188,6 @@ def png_rgb16_img(tmp_normal16_png): identify = [identify] assert "image" in identify[0] assert identify[0]["image"].get("format") == "PNG", str(identify) - assert ( - identify[0]["image"].get("formatDescription") == "Portable Network Graphics" - ), str(identify) assert identify[0]["image"].get("mimeType") == "image/png", str(identify) assert identify[0]["image"].get("geometry") == { "width": 60, @@ -1263,9 +1242,6 @@ def png_rgba8_img(tmp_path_factory, tmp_alpha_png): identify = [identify] assert "image" in identify[0] assert identify[0]["image"].get("format") == "PNG", str(identify) - assert ( - identify[0]["image"].get("formatDescription") == "Portable Network Graphics" - ), str(identify) assert identify[0]["image"].get("mimeType") == "image/png", str(identify) assert identify[0]["image"].get("geometry") == { "width": 60, @@ -1317,9 +1293,6 @@ def png_rgba16_img(tmp_alpha_png): identify = [identify] assert "image" in identify[0] assert identify[0]["image"].get("format") == "PNG", str(identify) - assert ( - identify[0]["image"].get("formatDescription") == "Portable Network Graphics" - ), str(identify) assert identify[0]["image"].get("mimeType") == "image/png", str(identify) assert identify[0]["image"].get("geometry") == { "width": 60, @@ -1387,9 +1360,6 @@ def png_gray8a_img(tmp_path_factory, tmp_alpha_png): identify = [identify] assert "image" in identify[0] assert identify[0]["image"].get("format") == "PNG", str(identify) - assert ( - identify[0]["image"].get("formatDescription") == "Portable Network Graphics" - ), str(identify) assert identify[0]["image"].get("mimeType") == "image/png", str(identify) assert identify[0]["image"].get("geometry") == { "width": 60, @@ -1453,9 +1423,6 @@ def png_gray16a_img(tmp_path_factory, tmp_alpha_png): identify = [identify] assert "image" in identify[0] assert identify[0]["image"].get("format") == "PNG", str(identify) - assert ( - identify[0]["image"].get("formatDescription") == "Portable Network Graphics" - ), str(identify) assert identify[0]["image"].get("mimeType") == "image/png", str(identify) assert identify[0]["image"].get("geometry") == { "width": 60, @@ -1511,9 +1478,6 @@ def png_interlaced_img(tmp_path_factory, tmp_normal_png): identify = [identify] assert "image" in identify[0] assert identify[0]["image"].get("format") == "PNG", str(identify) - assert ( - identify[0]["image"].get("formatDescription") == "Portable Network Graphics" - ), str(identify) assert identify[0]["image"].get("mimeType") == "image/png", str(identify) assert identify[0]["image"].get("geometry") == { "width": 60, @@ -1566,9 +1530,6 @@ def png_gray1_img(tmp_path_factory, tmp_gray1_png): identify = [identify] assert "image" in identify[0] assert identify[0]["image"].get("format") == "PNG", str(identify) - assert ( - identify[0]["image"].get("formatDescription") == "Portable Network Graphics" - ), str(identify) assert identify[0]["image"].get("mimeType") == "image/png", str(identify) assert identify[0]["image"].get("geometry") == { "width": 60, @@ -1620,9 +1581,6 @@ def png_gray2_img(tmp_path_factory, tmp_gray2_png): identify = [identify] assert "image" in identify[0] assert identify[0]["image"].get("format") == "PNG", str(identify) - assert ( - identify[0]["image"].get("formatDescription") == "Portable Network Graphics" - ), str(identify) assert identify[0]["image"].get("mimeType") == "image/png", str(identify) assert identify[0]["image"].get("geometry") == { "width": 60, @@ -1674,9 +1632,6 @@ def png_gray4_img(tmp_path_factory, tmp_gray4_png): identify = [identify] assert "image" in identify[0] assert identify[0]["image"].get("format") == "PNG", str(identify) - assert ( - identify[0]["image"].get("formatDescription") == "Portable Network Graphics" - ), str(identify) assert identify[0]["image"].get("mimeType") == "image/png", str(identify) assert identify[0]["image"].get("geometry") == { "width": 60, @@ -1728,9 +1683,6 @@ def png_gray8_img(tmp_path_factory, tmp_gray8_png): identify = [identify] assert "image" in identify[0] assert identify[0]["image"].get("format") == "PNG", str(identify) - assert ( - identify[0]["image"].get("formatDescription") == "Portable Network Graphics" - ), str(identify) assert identify[0]["image"].get("mimeType") == "image/png", str(identify) assert identify[0]["image"].get("geometry") == { "width": 60, @@ -1782,9 +1734,6 @@ def png_gray16_img(tmp_path_factory, tmp_gray16_png): identify = [identify] assert "image" in identify[0] assert identify[0]["image"].get("format") == "PNG", str(identify) - assert ( - identify[0]["image"].get("formatDescription") == "Portable Network Graphics" - ), str(identify) assert identify[0]["image"].get("mimeType") == "image/png", str(identify) assert identify[0]["image"].get("geometry") == { "width": 60, @@ -1837,9 +1786,6 @@ def png_palette1_img(tmp_path_factory, tmp_palette1_png): identify = [identify] assert "image" in identify[0] assert identify[0]["image"].get("format") == "PNG", str(identify) - assert ( - identify[0]["image"].get("formatDescription") == "Portable Network Graphics" - ), str(identify) assert identify[0]["image"].get("mimeType") == "image/png", str(identify) assert identify[0]["image"].get("geometry") == { "width": 60, @@ -1891,9 +1837,6 @@ def png_palette2_img(tmp_path_factory, tmp_palette2_png): identify = [identify] assert "image" in identify[0] assert identify[0]["image"].get("format") == "PNG", str(identify) - assert ( - identify[0]["image"].get("formatDescription") == "Portable Network Graphics" - ), str(identify) assert identify[0]["image"].get("mimeType") == "image/png", str(identify) assert identify[0]["image"].get("geometry") == { "width": 60, @@ -1945,9 +1888,6 @@ def png_palette4_img(tmp_path_factory, tmp_palette4_png): identify = [identify] assert "image" in identify[0] assert identify[0]["image"].get("format") == "PNG", str(identify) - assert ( - identify[0]["image"].get("formatDescription") == "Portable Network Graphics" - ), str(identify) assert identify[0]["image"].get("mimeType") == "image/png", str(identify) assert identify[0]["image"].get("geometry") == { "width": 60, @@ -1999,9 +1939,6 @@ def png_palette8_img(tmp_path_factory, tmp_palette8_png): identify = [identify] assert "image" in identify[0] assert identify[0]["image"].get("format") == "PNG", str(identify) - assert ( - identify[0]["image"].get("formatDescription") == "Portable Network Graphics" - ), str(identify) assert identify[0]["image"].get("mimeType") == "image/png", str(identify) assert identify[0]["image"].get("geometry") == { "width": 60, @@ -2053,10 +1990,6 @@ def gif_transparent_img(tmp_path_factory, tmp_alpha_png): identify = [identify] assert "image" in identify[0] assert identify[0]["image"].get("format") == "GIF", str(identify) - assert ( - identify[0]["image"]["formatDescription"] - == "CompuServe graphics interchange format" - ), str(identify) assert identify[0]["image"].get("mimeType") == "image/gif", str(identify) assert identify[0]["image"].get("geometry") == { "width": 60, @@ -2092,10 +2025,6 @@ def gif_palette1_img(tmp_path_factory, tmp_palette1_png): identify = [identify] assert "image" in identify[0] assert identify[0]["image"].get("format") == "GIF", str(identify) - assert ( - identify[0]["image"]["formatDescription"] - == "CompuServe graphics interchange format" - ), str(identify) assert identify[0]["image"].get("mimeType") == "image/gif", str(identify) assert identify[0]["image"].get("geometry") == { "width": 60, @@ -2131,10 +2060,6 @@ def gif_palette2_img(tmp_path_factory, tmp_palette2_png): identify = [identify] assert "image" in identify[0] assert identify[0]["image"].get("format") == "GIF", str(identify) - assert ( - identify[0]["image"]["formatDescription"] - == "CompuServe graphics interchange format" - ), str(identify) assert identify[0]["image"].get("mimeType") == "image/gif", str(identify) assert identify[0]["image"].get("geometry") == { "width": 60, @@ -2170,10 +2095,6 @@ def gif_palette4_img(tmp_path_factory, tmp_palette4_png): identify = [identify] assert "image" in identify[0] assert identify[0]["image"].get("format") == "GIF", str(identify) - assert ( - identify[0]["image"]["formatDescription"] - == "CompuServe graphics interchange format" - ), str(identify) assert identify[0]["image"].get("mimeType") == "image/gif", str(identify) assert identify[0]["image"].get("geometry") == { "width": 60, @@ -2209,10 +2130,6 @@ def gif_palette8_img(tmp_path_factory, tmp_palette8_png): identify = [identify] assert "image" in identify[0] assert identify[0]["image"].get("format") == "GIF", str(identify) - assert ( - identify[0]["image"]["formatDescription"] - == "CompuServe graphics interchange format" - ), str(identify) assert identify[0]["image"].get("mimeType") == "image/gif", str(identify) assert identify[0]["image"].get("geometry") == { "width": 60, @@ -2252,10 +2169,6 @@ def gif_animation_img(tmp_path_factory, tmp_normal_png, tmp_inverse_png): identify = [identify] assert "image" in identify[0] assert identify[0]["image"].get("format") == "GIF", str(identify) - assert ( - identify[0]["image"]["formatDescription"] - == "CompuServe graphics interchange format" - ), str(identify) assert identify[0]["image"].get("mimeType") == "image/gif", str(identify) assert identify[0]["image"].get("geometry") == { "width": 60, @@ -2285,10 +2198,6 @@ def gif_animation_img(tmp_path_factory, tmp_normal_png, tmp_inverse_png): identify = [identify] assert "image" in identify[0] assert identify[0]["image"].get("format") == "GIF", str(identify) - assert ( - identify[0]["image"]["formatDescription"] - == "CompuServe graphics interchange format" - ), str(identify) assert identify[0]["image"].get("mimeType") == "image/gif", str(identify) assert identify[0]["image"].get("geometry") == { "width": 60, @@ -2335,9 +2244,6 @@ def tiff_float_img(tmp_path_factory, tmp_normal_png): identify = [identify] assert "image" in identify[0] assert identify[0]["image"].get("format") == "TIFF", str(identify) - assert ( - identify[0]["image"].get("formatDescription") == "Tagged Image File Format" - ), str(identify) assert identify[0]["image"].get("mimeType") == "image/tiff", str(identify) assert identify[0]["image"].get("geometry") == { "width": 60, @@ -2392,9 +2298,6 @@ def tiff_cmyk8_img(tmp_path_factory, tmp_normal_png): identify = [identify] assert "image" in identify[0] assert identify[0]["image"].get("format") == "TIFF", str(identify) - assert ( - identify[0]["image"].get("formatDescription") == "Tagged Image File Format" - ), str(identify) assert identify[0]["image"].get("mimeType") == "image/tiff", str(identify) assert identify[0]["image"].get("geometry") == { "width": 60, @@ -2453,9 +2356,6 @@ def tiff_cmyk16_img(tmp_path_factory, tmp_normal_png): identify = [identify] assert "image" in identify[0] assert identify[0]["image"].get("format") == "TIFF", str(identify) - assert ( - identify[0]["image"].get("formatDescription") == "Tagged Image File Format" - ), str(identify) assert identify[0]["image"].get("mimeType") == "image/tiff", str(identify) assert identify[0]["image"].get("geometry") == { "width": 60, @@ -2504,9 +2404,6 @@ def tiff_rgb8_img(tmp_path_factory, tmp_normal_png): identify = [identify] assert "image" in identify[0] assert identify[0]["image"].get("format") == "TIFF", str(identify) - assert ( - identify[0]["image"].get("formatDescription") == "Tagged Image File Format" - ), str(identify) assert identify[0]["image"].get("mimeType") == "image/tiff", str(identify) assert identify[0]["image"].get("geometry") == { "width": 60, @@ -2556,9 +2453,6 @@ def tiff_rgb12_img(tmp_path_factory, tmp_normal16_png): identify = [identify] assert "image" in identify[0] assert identify[0]["image"].get("format") == "TIFF", str(identify) - assert ( - identify[0]["image"].get("formatDescription") == "Tagged Image File Format" - ), str(identify) assert identify[0]["image"].get("mimeType") == "image/tiff", str(identify) assert identify[0]["image"].get("geometry") == { "width": 60, @@ -2612,9 +2506,6 @@ def tiff_rgb14_img(tmp_path_factory, tmp_normal16_png): identify = [identify] assert "image" in identify[0] assert identify[0]["image"].get("format") == "TIFF", str(identify) - assert ( - identify[0]["image"].get("formatDescription") == "Tagged Image File Format" - ), str(identify) assert identify[0]["image"].get("mimeType") == "image/tiff", str(identify) assert identify[0]["image"].get("geometry") == { "width": 60, @@ -2668,9 +2559,6 @@ def tiff_rgb16_img(tmp_path_factory, tmp_normal16_png): identify = [identify] assert "image" in identify[0] assert identify[0]["image"].get("format") == "TIFF", str(identify) - assert ( - identify[0]["image"].get("formatDescription") == "Tagged Image File Format" - ), str(identify) assert identify[0]["image"].get("mimeType") == "image/tiff", str(identify) assert identify[0]["image"].get("geometry") == { "width": 60, @@ -2720,9 +2608,6 @@ def tiff_rgba8_img(tmp_path_factory, tmp_alpha_png): identify = [identify] assert "image" in identify[0] assert identify[0]["image"].get("format") == "TIFF", str(identify) - assert ( - identify[0]["image"].get("formatDescription") == "Tagged Image File Format" - ), str(identify) assert identify[0]["image"].get("mimeType") == "image/tiff", str(identify) assert identify[0]["image"].get("geometry") == { "width": 60, @@ -2772,9 +2657,6 @@ def tiff_rgba16_img(tmp_path_factory, tmp_alpha_png): identify = [identify] assert "image" in identify[0] assert identify[0]["image"].get("format") == "TIFF", str(identify) - assert ( - identify[0]["image"].get("formatDescription") == "Tagged Image File Format" - ), str(identify) assert identify[0]["image"].get("mimeType") == "image/tiff", str(identify) assert identify[0]["image"].get("geometry") == { "width": 60, @@ -2822,9 +2704,6 @@ def tiff_gray1_img(tmp_path_factory, tmp_gray1_png): identify = [identify] assert "image" in identify[0] assert identify[0]["image"].get("format") == "TIFF", str(identify) - assert ( - identify[0]["image"].get("formatDescription") == "Tagged Image File Format" - ), str(identify) assert identify[0]["image"].get("mimeType") == "image/tiff", str(identify) assert identify[0]["image"].get("geometry") == { "width": 60, @@ -2873,9 +2752,6 @@ def tiff_gray2_img(tmp_path_factory, tmp_gray2_png): identify = [identify] assert "image" in identify[0] assert identify[0]["image"].get("format") == "TIFF", str(identify) - assert ( - identify[0]["image"].get("formatDescription") == "Tagged Image File Format" - ), str(identify) assert identify[0]["image"].get("mimeType") == "image/tiff", str(identify) assert identify[0]["image"].get("geometry") == { "width": 60, @@ -2924,9 +2800,6 @@ def tiff_gray4_img(tmp_path_factory, tmp_gray4_png): identify = [identify] assert "image" in identify[0] assert identify[0]["image"].get("format") == "TIFF", str(identify) - assert ( - identify[0]["image"].get("formatDescription") == "Tagged Image File Format" - ), str(identify) assert identify[0]["image"].get("mimeType") == "image/tiff", str(identify) assert identify[0]["image"].get("geometry") == { "width": 60, @@ -2975,9 +2848,6 @@ def tiff_gray8_img(tmp_path_factory, tmp_gray8_png): identify = [identify] assert "image" in identify[0] assert identify[0]["image"].get("format") == "TIFF", str(identify) - assert ( - identify[0]["image"].get("formatDescription") == "Tagged Image File Format" - ), str(identify) assert identify[0]["image"].get("mimeType") == "image/tiff", str(identify) assert identify[0]["image"].get("geometry") == { "width": 60, @@ -3026,9 +2896,6 @@ def tiff_gray16_img(tmp_path_factory, tmp_gray16_png): identify = [identify] assert "image" in identify[0] assert identify[0]["image"].get("format") == "TIFF", str(identify) - assert ( - identify[0]["image"].get("formatDescription") == "Tagged Image File Format" - ), str(identify) assert identify[0]["image"].get("mimeType") == "image/tiff", str(identify) assert identify[0]["image"].get("geometry") == { "width": 60, @@ -3081,9 +2948,6 @@ def tiff_multipage_img(tmp_path_factory, tmp_normal_png, tmp_inverse_png): identify = [identify] assert "image" in identify[0] assert identify[0]["image"].get("format") == "TIFF", str(identify) - assert ( - identify[0]["image"].get("formatDescription") == "Tagged Image File Format" - ), str(identify) assert identify[0]["image"].get("mimeType") == "image/tiff", str(identify) assert identify[0]["image"].get("geometry") == { "width": 60, @@ -3125,9 +2989,6 @@ def tiff_multipage_img(tmp_path_factory, tmp_normal_png, tmp_inverse_png): identify = [identify] assert "image" in identify[0] assert identify[0]["image"].get("format") == "TIFF", str(identify) - assert ( - identify[0]["image"].get("formatDescription") == "Tagged Image File Format" - ), str(identify) assert identify[0]["image"].get("mimeType") == "image/tiff", str(identify) assert identify[0]["image"].get("geometry") == { "width": 60, @@ -3176,9 +3037,6 @@ def tiff_palette1_img(tmp_path_factory, tmp_palette1_png): identify = [identify] assert "image" in identify[0] assert identify[0]["image"].get("format") == "TIFF", str(identify) - assert ( - identify[0]["image"].get("formatDescription") == "Tagged Image File Format" - ), str(identify) assert identify[0]["image"].get("mimeType") == "image/tiff", str(identify) assert identify[0]["image"].get("geometry") == { "width": 60, @@ -3228,9 +3086,6 @@ def tiff_palette2_img(tmp_path_factory, tmp_palette2_png): identify = [identify] assert "image" in identify[0] assert identify[0]["image"].get("format") == "TIFF", str(identify) - assert ( - identify[0]["image"].get("formatDescription") == "Tagged Image File Format" - ), str(identify) assert identify[0]["image"].get("mimeType") == "image/tiff", str(identify) assert identify[0]["image"].get("geometry") == { "width": 60, @@ -3280,9 +3135,6 @@ def tiff_palette4_img(tmp_path_factory, tmp_palette4_png): identify = [identify] assert "image" in identify[0] assert identify[0]["image"].get("format") == "TIFF", str(identify) - assert ( - identify[0]["image"].get("formatDescription") == "Tagged Image File Format" - ), str(identify) assert identify[0]["image"].get("mimeType") == "image/tiff", str(identify) assert identify[0]["image"].get("geometry") == { "width": 60, @@ -3332,9 +3184,6 @@ def tiff_palette8_img(tmp_path_factory, tmp_palette8_png): identify = [identify] assert "image" in identify[0] assert identify[0]["image"].get("format") == "TIFF", str(identify) - assert ( - identify[0]["image"].get("formatDescription") == "Tagged Image File Format" - ), str(identify) assert identify[0]["image"].get("mimeType") == "image/tiff", str(identify) assert identify[0]["image"].get("geometry") == { "width": 60, @@ -3397,9 +3246,6 @@ def tiff_ccitt_lsb_m2l_white_img(tmp_path_factory, tmp_gray1_png): identify = [identify] assert "image" in identify[0] assert identify[0]["image"].get("format") == "TIFF", str(identify) - assert ( - identify[0]["image"].get("formatDescription") == "Tagged Image File Format" - ), str(identify) assert identify[0]["image"].get("mimeType") == "image/tiff", str(identify) assert identify[0]["image"].get("geometry") == { "width": 60, @@ -3479,9 +3325,6 @@ def tiff_ccitt_msb_m2l_white_img(tmp_path_factory, tmp_gray1_png): identify = [identify] assert "image" in identify[0] assert identify[0]["image"].get("format") == "TIFF", str(identify) - assert ( - identify[0]["image"].get("formatDescription") == "Tagged Image File Format" - ), str(identify) assert identify[0]["image"].get("mimeType") == "image/tiff", str(identify) assert identify[0]["image"].get("geometry") == { "width": 60, @@ -3562,9 +3405,6 @@ def tiff_ccitt_msb_l2m_white_img(tmp_path_factory, tmp_gray1_png): identify = [identify] assert "image" in identify[0] assert identify[0]["image"].get("format") == "TIFF", str(identify) - assert ( - identify[0]["image"].get("formatDescription") == "Tagged Image File Format" - ), str(identify) assert identify[0]["image"].get("mimeType") == "image/tiff", str(identify) assert identify[0]["image"].get("geometry") == { "width": 60, @@ -3650,9 +3490,6 @@ def tiff_ccitt_lsb_m2l_black_img(tmp_path_factory, tmp_gray1_png): identify = [identify] assert "image" in identify[0] assert identify[0]["image"].get("format") == "TIFF", str(identify) - assert ( - identify[0]["image"].get("formatDescription") == "Tagged Image File Format" - ), str(identify) assert identify[0]["image"].get("mimeType") == "image/tiff", str(identify) assert identify[0]["image"].get("geometry") == { "width": 60, @@ -3741,9 +3578,6 @@ def tiff_ccitt_nometa1_img(tmp_path_factory, tmp_gray1_png): identify = [identify] assert "image" in identify[0] assert identify[0]["image"].get("format") == "TIFF", str(identify) - assert ( - identify[0]["image"].get("formatDescription") == "Tagged Image File Format" - ), str(identify) assert identify[0]["image"].get("mimeType") == "image/tiff", str(identify) assert identify[0]["image"].get("geometry") == { "width": 60, @@ -3826,9 +3660,6 @@ def tiff_ccitt_nometa2_img(tmp_path_factory, tmp_gray1_png): identify = [identify] assert "image" in identify[0] assert identify[0]["image"].get("format") == "TIFF", str(identify) - assert ( - identify[0]["image"].get("formatDescription") == "Tagged Image File Format" - ), str(identify) assert identify[0]["image"].get("mimeType") == "image/tiff", str(identify) assert identify[0]["image"].get("geometry") == { "width": 60, @@ -3888,9 +3719,6 @@ def png_icc_img(tmp_icc_png): identify = [identify] assert "image" in identify[0] assert identify[0]["image"].get("format") == "PNG", str(identify) - assert ( - identify[0]["image"].get("formatDescription") == "Portable Network Graphics" - ), str(identify) assert identify[0]["image"].get("mimeType") == "image/png", str(identify) assert identify[0]["image"].get("geometry") == { "width": 60,