python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-09-21 11:28:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4471 from radarhere/exif_imagemagick

Browse Source 
Added reading of earlier ImageMagick PNG EXIF data
This commit is contained in:
Hugo van Kemenade 2020-03-26 13:42:58 +02:00 committed by GitHub
commit 3970db0535
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Tests/images/exif_imagemagick.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 175 KiB

11
Tests/test_file_png.py
View File

@ -592,8 +592,15 @@ class TestFilePng:
with Image.open("Tests/images/hopper_idat_after_image_end.png") as im: with Image.open("Tests/images/hopper_idat_after_image_end.png") as im:
assert im.text == {"TXT": "VALUE", "ZIP": "VALUE"} assert im.text == {"TXT": "VALUE", "ZIP": "VALUE"}
def test_exif(self): @pytest.mark.parametrize(
with Image.open("Tests/images/exif.png") as im: "test_file",
[
"Tests/images/exif.png", # With an EXIF chunk
"Tests/images/exif_imagemagick.png", # With an ImageMagick zTXt chunk
],
)
def test_exif(self, test_file):
with Image.open(test_file) as im:
exif = im._getexif() exif = im._getexif()
assert exif[274] == 1 assert exif[274] == 1

14
src/PIL/PngImagePlugin.py
View File

@ -694,14 +694,24 @@ class PngImageFile(ImageFile.ImageFile):
def _getexif(self): def _getexif(self):
if "exif" not in self.info: if "exif" not in self.info:
self.load() self.load()
if "exif" not in self.info: if "exif" not in self.info and "Raw profile type exif" not in self.info:
return None return None
return dict(self.getexif()) return dict(self.getexif())
def getexif(self): def getexif(self):
if "exif" not in self.info: if "exif" not in self.info:
self.load() self.load()
return ImageFile.ImageFile.getexif(self)
if self._exif is None:
self._exif = Image.Exif()
exif_info = self.info.get("exif")
if exif_info is None and "Raw profile type exif" in self.info:
exif_info = bytes.fromhex(
"".join(self.info["Raw profile type exif"].split("\n")[3:])
)
self._exif.load(exif_info)
return self._exif
# -------------------------------------------------------------------- # --------------------------------------------------------------------