From c4060f23c88ece87a5e97daccf1c7c37cbe80b88 Mon Sep 17 00:00:00 2001
From: jevans <john.g.evans.ne@gmail.com>
Date: Sat, 26 Oct 2013 19:23:33 -0400
Subject: [PATCH] Added big endian Exif support.  #104

---
 glymur/_uuid_io/Exif.py         |  6 +++---
 glymur/test/test_jp2box_uuid.py | 25 +++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/glymur/_uuid_io/Exif.py b/glymur/_uuid_io/Exif.py
index ccc03dd..fb5e2a1 100644
--- a/glymur/_uuid_io/Exif.py
+++ b/glymur/_uuid_io/Exif.py
@@ -34,8 +34,8 @@ class UUIDExif(object):
         self.read_buffer = read_buffer
 
         # Ignore the first six bytes.
-        # Next 8 should be (73, 73, 42, 8)
-        data = struct.unpack('<BBHI', read_buffer[6:14])
+        # Next 8 should be (73, 73, 42, 8) or (77, 77, 42, 8)
+        data = struct.unpack('<BB', read_buffer[6:8])
         if data[0] == 73 and data[1] == 73:
             # little endian
             self.endian = '<'
@@ -46,7 +46,7 @@ class UUIDExif(object):
             msg = "Bad byte order indication: {0}".format(read_buffer[6:8])
             raise RuntimeError(msg)
 
-        offset = data[3]
+        _, offset = struct.unpack(self.endian + 'HI', read_buffer[8:14])
 
         # This is the 'Exif Image' portion.
         exif = _ExifImageIfd(self.endian, read_buffer[6:], offset)
diff --git a/glymur/test/test_jp2box_uuid.py b/glymur/test/test_jp2box_uuid.py
index a1d93a4..e8cb7be 100644
--- a/glymur/test/test_jp2box_uuid.py
+++ b/glymur/test/test_jp2box_uuid.py
@@ -129,5 +129,30 @@ class TestUUIDExif(unittest.TestCase):
 
             self.assertEqual(j.box[-1].box_id, 'uuid')
 
+    def test_big_endian(self):
+        """Verify read of big-endian IFD."""
+        with tempfile.NamedTemporaryFile(suffix='.jp2', mode='wb') as tfile:
+
+            with open(self.jp2file, 'rb') as ifptr:
+                tfile.write(ifptr.read())
+
+            # Write L, T, UUID identifier.
+            tfile.write(struct.pack('>I4s', 52, b'uuid'))
+            tfile.write(b'JpgTiffExif->JP2')
+
+            tfile.write(b'Exif\x00\x00')
+            xbuffer = struct.pack('>BBHI', 77, 77, 42, 8)
+            tfile.write(xbuffer)
+
+            # We will write just a single tag.
+            tfile.write(struct.pack('>H', 1))
+
+            # The "Make" tag is tag no. 271.
+            tfile.write(struct.pack('>HHI4s', 271, 2, 3, b'HTC\x00'))
+            tfile.flush()
+
+            jp2 = glymur.Jp2k(tfile.name)
+            self.assertEqual(jp2.box[-1].data.ifds['Image']['Make'], "HTC")
+
 if __name__ == "__main__":
     unittest.main()