marc
/
igc2kmz
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't assume all APP1 chunks are Exif chunks.

This commit is contained in:
Tom Payne 2008-10-07 20:52:33 +02:00
parent 82287f4eca
commit f7321300eb
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
igc2kmz/exif.py
View File

@ -225,9 +225,7 @@ IFD_POINTER_TAGS = {
def exif(data):
if data[0:6] != 'Exif\0\0':
raise SyntaxError, 'Invalid EXIF header %s' % repr(data[0:6])
tiff = TIFF(data[6:])
tiff = TIFF(data)
result = {}
for ifd_offset in tiff.ifd_offsets():
for tag, value in tiff.ifd_tags(ifd_offset):
@ -275,8 +273,8 @@ class JPEG(object):
self.exif = {}
self.height = self.width = None
for tag, data in JPEG.chunks(file):
if tag == APP1:
self.exif = exif(data)
if tag == APP1 and data[0:6] == 'Exif\0\0':
self.exif = exif(data[6:])
elif tag == SOF:
self.height, self.width = struct.unpack('>HH', data[1:5])