Changeset 3643

Timestamp:

19/10/08 16:16:11 (3 months ago)

Author:

tack

Message:

Make EXIF a bit more robust: fixes parse failures for EXIF test images at
https://sourceforge.net/project/showfiles.php?group_id=187210

Files:

• trunk/metadata/src/image/EXIF.py (modified) (2 diffs)

trunk/metadata/src/image/EXIF.py

@@ -1249 +1249 @@
 
         # add pixel strips and update strip offset info
-        old_offsets = self.tags['Thumbnail StripOffsets'].values
-        old_counts = self.tags['Thumbnail StripByteCounts'].values
+        # kaa.metadata addition: wrap key access in try/except in case
+        # keys do not exist, in which case we cannot extract TIFF thumbnail
+        try:
+            old_offsets = self.tags['Thumbnail StripOffsets'].values
+            old_counts = self.tags['Thumbnail StripByteCounts'].values
+        except KeyError:
+            return
+
         for i in range(len(old_offsets)):
             # update offset pointer (more nasty "strings are immutable" crap)
@@ -1465 +1471 @@
 
     # deal with MakerNote contained in EXIF IFD
-    if 'EXIF MakerNote' in hdr.tags and detailed:
+    # kaa.metadata addition: also test 'Image Make' in hdr.tags before
+    # calling decode_maker_note().
+    if 'EXIF MakerNote' in hdr.tags and 'Image Make' in hdr.tags and detailed:
         hdr.decode_maker_note()