jyapayne/glymur
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

closes #148

Browse source
This commit is contained in:
jevans 2014-02-03 19:51:34 -05:00
commit 60656be667
2 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
glymur/jp2box.py
View file

@ -2477,7 +2477,7 @@ class DataEntryURLBox(Jp2kBox):
numbytes = offset + length - fptr.tell() numbytes = offset + length - fptr.tell()
read_buffer = fptr.read(numbytes) read_buffer = fptr.read(numbytes)
url = read_buffer.decode('utf-8') url = read_buffer.decode('utf-8').rstrip(chr(0))
box = DataEntryURLBox(version, flag, url, length=length, offset=offset) box = DataEntryURLBox(version, flag, url, length=length, offset=offset)
return box return box

23
glymur/test/test_jp2box_jpx.py
View file

@ -54,7 +54,10 @@ class TestJPXOther(unittest.TestCase):
with tempfile.NamedTemporaryFile(suffix='.jpx') as tfile: with tempfile.NamedTemporaryFile(suffix='.jpx') as tfile:
with open(self.jpxfile, 'rb') as ifile: with open(self.jpxfile, 'rb') as ifile:
tfile.write(ifile.read()) tfile.write(ifile.read())
write_buffer = struct.pack('>I4s', 50, b'dtbl') # 8 + 2 + 20 + 36
boxlen = 66
write_buffer = struct.pack('>I4s', boxlen, b'dtbl')
tfile.write(write_buffer) tfile.write(write_buffer)
# Just two boxes. # Just two boxes.
@ -62,15 +65,20 @@ class TestJPXOther(unittest.TestCase):
tfile.write(write_buffer) tfile.write(write_buffer)
# First data entry url box. # First data entry url box.
write_buffer = struct.pack('>I4s', 20, b'url ') # This one will have a URL with 3 null chars at the end.
# They should be stripped off.
write_buffer = struct.pack('>I4s', 36, b'url ')
tfile.write(write_buffer) tfile.write(write_buffer)
write_buffer = struct.pack('>BBBB8s', 0, 0, 0, 0, b'file:///') url1 = 'file:////usr/local/bin'
write_buffer = struct.pack('>BBBB24s', 0, 0, 0, 0,
(url1 + chr(0) * 3).encode())
tfile.write(write_buffer) tfile.write(write_buffer)
# Second data entry url box. # 2nd data entry url box.
write_buffer = struct.pack('>I4s', 20, b'url ') write_buffer = struct.pack('>I4s', 20, b'url ')
tfile.write(write_buffer) tfile.write(write_buffer)
write_buffer = struct.pack('>BBBB8s', 0, 0, 0, 0, b'file:///') url2 = 'file:///'
write_buffer = struct.pack('>BBBB8s', 0, 0, 0, 0, url2.encode())
tfile.write(write_buffer) tfile.write(write_buffer)
tfile.flush() tfile.flush()
@ -80,6 +88,8 @@ class TestJPXOther(unittest.TestCase):
self.assertEqual(jpx.box[-1].box_id, 'dtbl') self.assertEqual(jpx.box[-1].box_id, 'dtbl')
self.assertEqual(len(jpx.box[-1].DR), 2) self.assertEqual(len(jpx.box[-1].DR), 2)
self.assertEqual(jpx.box[-1].DR[0].url, url1)
self.assertEqual(jpx.box[-1].DR[1].url, url2)
def test_ftbl(self): def test_ftbl(self):
@ -110,7 +120,6 @@ class TestJPXOther(unittest.TestCase):
self.assertEqual(jpx.box[-1].box[0].fragment_length, (170246,)) self.assertEqual(jpx.box[-1].box[0].fragment_length, (170246,))
self.assertEqual(jpx.box[-1].box[0].data_reference, (3,)) self.assertEqual(jpx.box[-1].box[0].data_reference, (3,))
def test_nlst(self): def test_nlst(self):
"""Verify that we can handle a free box.""" """Verify that we can handle a free box."""
with warnings.catch_warnings(): with warnings.catch_warnings():
@ -129,5 +138,3 @@ class TestJPXOther(unittest.TestCase):
# Compositing Layer 0 # Compositing Layer 0
self.assertEqual(j.box[16].box[1].box[0].associations[1], 2 << 24) self.assertEqual(j.box[16].box[1].box[0].associations[1], 2 << 24)