Skip to content

Commit

Permalink
Merge 47f5c9e into 0bc24cb
Browse files Browse the repository at this point in the history
  • Loading branch information
bpedersen2 committed Feb 23, 2015
2 parents 0bc24cb + 47f5c9e commit 4f5dd91
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 0 deletions.
9 changes: 9 additions & 0 deletions PIL/TiffImagePlugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -517,6 +517,15 @@ def save(self, fp):
elif typ == 7:
# untyped data
data = value = b"".join(value)
elif typ in (11, 12):
# float value
tmap = {11: 'f', 12: 'd'}
if not isinstance(value, tuple):
value = (value,)
a = array.array(tmap[typ], value)
if self.prefix != native_prefix:
a.byteswap()
data = a.tostring()
elif isStringType(value[0]):
# string data
if isinstance(value, tuple):
Expand Down
11 changes: 11 additions & 0 deletions Tests/test_file_tiff_metadata.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,18 @@ def test_rt_metadata(self):
img = hopper()

textdata = "This is some arbitrary metadata for a text field"
floatdata = 12.345
doubledata = 67.89

info = TiffImagePlugin.ImageFileDirectory()

info[tag_ids['ImageJMetaDataByteCounts']] = len(textdata)
info[tag_ids['ImageJMetaData']] = textdata
info[tag_ids['RollAngle']] = floatdata
info.tagtype[tag_ids['RollAngle']] = 11

info[tag_ids['YawAngle']] = doubledata
info.tagtype[tag_ids['YawAngle']] = 12

f = self.tempfile("temp.tif")

Expand All @@ -29,6 +37,9 @@ def test_rt_metadata(self):

self.assertEqual(loaded.tag[50838], (len(textdata),))
self.assertEqual(loaded.tag[50839], textdata)
self.assertAlmostEqual(loaded.tag[tag_ids['RollAngle']][0], floatdata,
places=5)
self.assertAlmostEqual(loaded.tag[tag_ids['YawAngle']][0], doubledata)

def test_read_metadata(self):
img = Image.open('Tests/images/hopper_g4.tif')
Expand Down

0 comments on commit 4f5dd91

Please sign in to comment.