Merge 4c52696 into 89901e0

python-pillow · Apr 16, 2016 · 220e7af · 220e7af
2 parents 89901e0 + 4c52696
commit 220e7af
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/PIL/TiffImagePlugin.py b/PIL/TiffImagePlugin.py
@@ -554,6 +554,8 @@ def _setitem(self, tag, value, legacy_api):
         if info.length == 1:
             if legacy_api and self.tagtype[tag] in [5, 10]:
                 values = values,
+            elif not legacy_api and self.tagtype[tag] == 1:
+                values = values,
             dest[tag], = values
         else:
             dest[tag] = values

diff --git a/PIL/TiffTags.py b/PIL/TiffTags.py
@@ -152,7 +152,7 @@ def lookup(tag):
 
     # FIXME add more tags here
     34665: ("ExifIFD", SHORT, 1),
-    34675: ('ICCProfile', 7, 0),
+    34675: ('ICCProfile', 7, 1),
     34853: ('GPSInfoIFD', 1, 1),
 
     # MPInfo

diff --git a/Tests/test_file_tiff_metadata.py b/Tests/test_file_tiff_metadata.py
@@ -175,7 +175,7 @@ def test_iccprofile(self):
 
         im.save(out)
         reloaded = Image.open(out)
-        self.assert_(type(im.info['icc_profile']) is not type(tuple))
+        self.assertNotEqual(type(im.info['icc_profile']), tuple)
         self.assertEqual(im.info['icc_profile'], reloaded.info['icc_profile'])
 
     def test_iccprofile_binary(self):