From 392d4a665e98577796cc0a624efcf01b8d929725 Mon Sep 17 00:00:00 2001 From: Johannes Schauer Marin Rodrigues Date: Sun, 3 Oct 2021 21:03:08 +0200 Subject: [PATCH] adapt AlphaChannelError messages --- src/img2pdf.py | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/img2pdf.py b/src/img2pdf.py index 0e5ab5d..b53d659 100755 --- a/src/img2pdf.py +++ b/src/img2pdf.py @@ -1230,16 +1230,11 @@ def get_imgmetadata( if depth > 8: logger.warning("Image with transparency and a bit depth of %d." % depth) logger.warning("This is unsupported due to PIL limitations.") - raise AlphaChannelError("Refusing to work with multiple >8bit channels.") - elif (ics in ["LA", "PA", "RGBA"] or "transparency" in imgdata.info): - logger.warning("Image contains transparency which cannot be retained in PDF.") - logger.warning("img2pdf will not perform a lossy operation.") - logger.warning("You can remove the alpha channel using imagemagick:") - logger.warning( - " $ convert input.png -background white -alpha " - "remove -alpha off output.png" - ) - raise AlphaChannelError("Refusing to work on images with alpha channel") + raise AlphaChannelError( + "Refusing to work with multiple >8bit channels." + ) + elif ics in ["LA", "PA", "RGBA"] or "transparency" in imgdata.info: + raise AlphaChannelError("This function must not be called on images with alpha") # Since commit 07a96209597c5e8dfe785c757d7051ce67a980fb or release 4.1.0 # Pillow retrieves the DPI from EXIF if it cannot find the DPI in the JPEG