josch/img2pdf
3
6
Fork 10
Code Issues 22 Pull requests 5 Projects Releases 3 Wiki Activity

add AlphaChannelError and ExifOrientationError exceptions

Browse source
This commit is contained in:
Johannes 'josch' Schauer 2019-03-28 10:26:46 +01:00
parent 07903e9ef1
commit 01022487b7
Signed by: josch
GPG key ID: F2CBA5C78FBD83E1
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/img2pdf.py
View file

@ -363,6 +363,14 @@ class PdfTooLargeError(Exception):
pass pass
class AlphaChannelError(Exception):
pass
class ExifOrientationError(Exception):
pass
# without pdfrw this function is a no-op # without pdfrw this function is a no-op
def my_convert_load(string): def my_convert_load(string):
return string return string
@ -987,7 +995,7 @@ def get_imgmetadata(imgdata, imgformat, default_dpi, colorspace, rawdata=None):
" $ convert input.png -background white -alpha " " $ convert input.png -background white -alpha "
"remove -alpha off output.png" "remove -alpha off output.png"
) )
raise Exception("Refusing to work on images with alpha channel") raise AlphaChannelError("Refusing to work on images with alpha channel")
# Since commit 07a96209597c5e8dfe785c757d7051ce67a980fb or release 4.1.0 # Since commit 07a96209597c5e8dfe785c757d7051ce67a980fb or release 4.1.0
# Pillow retrieves the DPI from EXIF if it cannot find the DPI in the JPEG # Pillow retrieves the DPI from EXIF if it cannot find the DPI in the JPEG
@ -1021,9 +1029,11 @@ def get_imgmetadata(imgdata, imgformat, default_dpi, colorspace, rawdata=None):
elif value == 8: elif value == 8:
rotation = 270 rotation = 270
elif value in (2, 4, 5, 7): elif value in (2, 4, 5, 7):
raise Exception("Unsupported flipped rotation mode (%d)" % value) raise ExifOrientationError(
"Unsupported flipped rotation mode (%d)" % value
)
else: else:
raise Exception("Invalid rotation (%d)" % value) raise ExifOrientationError("Invalid rotation (%d)" % value)
logging.debug("rotation = %d°", rotation) logging.debug("rotation = %d°", rotation)