From 83c57a80637b630cc21a7a068e453bd0d790875f Mon Sep 17 00:00:00 2001 From: Eric Soroos Date: Fri, 8 Sep 2017 18:20:48 +0000 Subject: [PATCH] Specific change for issue #2006, ImageJ Metadata counts are incorrect in TiffTags --- PIL/TiffTags.py | 4 ++-- Tests/test_file_tiff_metadata.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/PIL/TiffTags.py b/PIL/TiffTags.py index e46cb02c1..eba88ef8d 100644 --- a/PIL/TiffTags.py +++ b/PIL/TiffTags.py @@ -193,8 +193,8 @@ TAGS_V2 = { 50741: ("MakerNoteSafety", SHORT, 1, {"Unsafe": 0, "Safe": 1}), 50780: ("BestQualityScale", RATIONAL, 1), - 50838: ("ImageJMetaDataByteCounts", LONG, 1), - 50839: ("ImageJMetaData", UNDEFINED, 1) + 50838: ("ImageJMetaDataByteCounts", LONG, 0), # Can be more than one + 50839: ("ImageJMetaData", UNDEFINED, 1) # see Issue #2006 } # Legacy Tags structure diff --git a/Tests/test_file_tiff_metadata.py b/Tests/test_file_tiff_metadata.py index 3818d77a1..90fad52c2 100644 --- a/Tests/test_file_tiff_metadata.py +++ b/Tests/test_file_tiff_metadata.py @@ -56,7 +56,7 @@ class TestFileTiffMetadata(PillowTestCase): loaded = Image.open(f) self.assertEqual(loaded.tag[ImageJMetaDataByteCounts], (len(bindata),)) - self.assertEqual(loaded.tag_v2[ImageJMetaDataByteCounts], len(bindata)) + self.assertEqual(loaded.tag_v2[ImageJMetaDataByteCounts], (len(bindata),)) self.assertEqual(loaded.tag[ImageJMetaData], bindata) self.assertEqual(loaded.tag_v2[ImageJMetaData], bindata)