m

hMatoba · May 14, 2015 · 75a25e5 · 75a25e5
1 parent 3c13be5
commit 75a25e5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/piexif/_load.py b/piexif/_load.py
@@ -107,7 +107,7 @@ def get_ifd_dict(self, pointer, ifd_name, read_unknown=False):
                                       )[0]
             value = self.tiftag[pointer+8: pointer+12]
             p_and_value.append((pointer, value_type, value_num, value))
-            v_set = (value_type, value_num, value)
+            v_set = (value_type, value_num, value, tag)
             if tag in TAGS[t]:
                 ifd_dict[tag] = self.convert_value(v_set)
             elif read_unknown:
@@ -205,7 +205,8 @@ def convert_value(self, val):
                                       )[0])
         else:
             raise ValueError("Exif might be wrong. Got incorrect value " +
-                             "type to decode.")
+                             "type to decode.\n" +
+                             "tag: " + str(val[3]) + "\ntype: " + str(t))
 
         if isinstance(data, tuple) and (len(data) == 1):
             return data[0]

diff --git a/tests/s_test.py b/tests/s_test.py
@@ -572,7 +572,7 @@ def test_ExifReader_return_unknown(self):
     def test_ExifReader_convert_value_fail(self):
         er = piexif._load._ExifReader(I1)
         with self.assertRaises(ValueError):
-            er.convert_value((None, None, None))
+            er.convert_value((None, None, None, None))
 
     def test_split_into_segments_fail1(self):
         with self.assertRaises(ValueError):