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

Merge branch 'issue204' into devel

Browse source
This commit is contained in:
John Evans 2014-04-04 12:27:52 -04:00
commit c12180ccb0
1 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
glymur/jp2box.py
View file

@ -138,18 +138,19 @@ class Jp2kBox(object):
return '\n'.join(lst) return '\n'.join(lst)
def _write_superbox(self, fptr): def _write_superbox(self, fptr, box_id):
"""Write a superbox. """Write a superbox.
Parameters Parameters
---------- ----------
fptr : file or file object fptr : file or file object
Superbox (box of boxes) to be written to this file. Superbox (box of boxes) to be written to this file.
box_id : bytes
4-byte sequence that identifies the superbox.
""" """
# Write the contained boxes, then come back and write the length. # Write the contained boxes, then come back and write the length.
orig_pos = fptr.tell() orig_pos = fptr.tell()
fptr.write(struct.pack('>I', 0)) fptr.write(struct.pack('>I4s', 0, box_id))
fptr.write(self.box_id.encode())
for box in self.box: for box in self.box:
box.write(fptr) box.write(fptr)
@ -710,7 +711,7 @@ class CodestreamHeaderBox(Jp2kBox):
def write(self, fptr): def write(self, fptr):
"""Write a codestream header box to file. """Write a codestream header box to file.
""" """
self._write_superbox(fptr) self._write_superbox(fptr, b'jpch')
@classmethod @classmethod
def parse(cls, fptr, offset, length): def parse(cls, fptr, offset, length):
@ -779,7 +780,7 @@ class ColourGroupBox(Jp2kBox):
"""Write a colour group box to file. """Write a colour group box to file.
""" """
self._validate(writing=True) self._validate(writing=True)
self._write_superbox(fptr) self._write_superbox(fptr, b'cgrp')
@classmethod @classmethod
def parse(cls, fptr, offset, length): def parse(cls, fptr, offset, length):
@ -842,7 +843,7 @@ class CompositingLayerHeaderBox(Jp2kBox):
def write(self, fptr): def write(self, fptr):
"""Write a compositing layer header box to file. """Write a compositing layer header box to file.
""" """
self._write_superbox(fptr) self._write_superbox(fptr, b'jplh')
@classmethod @classmethod
def parse(cls, fptr, offset, length): def parse(cls, fptr, offset, length):
@ -1427,7 +1428,7 @@ class FragmentTableBox(Jp2kBox):
"""Write a fragment table box to file. """Write a fragment table box to file.
""" """
self._validate(writing=True) self._validate(writing=True)
self._write_superbox(fptr) self._write_superbox(fptr, b'ftbl')
@ -1681,7 +1682,7 @@ class AssociationBox(Jp2kBox):
def write(self, fptr): def write(self, fptr):
"""Write an association box to file. """Write an association box to file.
""" """
self._write_superbox(fptr) self._write_superbox(fptr, b'asoc')
class JP2HeaderBox(Jp2kBox): class JP2HeaderBox(Jp2kBox):
@ -1717,7 +1718,7 @@ class JP2HeaderBox(Jp2kBox):
def write(self, fptr): def write(self, fptr):
"""Write a JP2 Header box to file. """Write a JP2 Header box to file.
""" """
self._write_superbox(fptr) self._write_superbox(fptr, b'jp2h')
@classmethod @classmethod
def parse(cls, fptr, offset, length): def parse(cls, fptr, offset, length):