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

Issue #175 related. The original was SmartAlbums, but another case with 'Adobe PS', so delete the exif_software check part

Browse source
This commit is contained in:
Leo 2023-10-18 13:33:44 +08:00
parent f157ced05d
commit 5cd0918d50
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/img2pdf.py
View file

@ -1481,21 +1481,17 @@ def get_imgmetadata(
# SmartAlbums old version (found 2.2.6) exports JPG with only 1 compone # SmartAlbums old version (found 2.2.6) exports JPG with only 1 compone
# with an RGB ICC profile which is useless. # with an RGB ICC profile which is useless.
# This produces an error in Adobe Acrobat, so we ignore it with a warning. # This produces an error in Adobe Acrobat, so we ignore it with a warning.
# Update: Found another case, the JPG is created by Adobe PhotoShop, so we
# don't check software anymore.
if iccp is not None and ( if iccp is not None and (
(color == Colorspace["L"] and imgformat == ImageFormat.JPEG) (color == Colorspace["L"] and imgformat == ImageFormat.JPEG)
): ):
exifsoft = None
if hasattr(imgdata, "_getexif") and imgdata._getexif() is not None:
for tag, value in imgdata._getexif().items():
if TAGS.get(tag, tag) == "Software":
exifsoft = value
with io.BytesIO(iccp) as f: with io.BytesIO(iccp) as f:
prf = ImageCms.ImageCmsProfile(f) prf = ImageCms.ImageCmsProfile(f)
if (prf.profile.model and "sRGB" in prf.profile.model) and (
exifsoft and "SmartAlbums" in exifsoft if prf.profile.xcolor_space not in ('GRAY'):
):
logger.warning( logger.warning(
"Ignoring RGB ICC profile in Grayscale JPG created by SmartAlbums" "Ignoring non-GRAY ICC profile in Grayscale JPG"
) )
iccp = None iccp = None