From c8b0e26971be2468a59c1bcfb2ce376da035c635 Mon Sep 17 00:00:00 2001 From: John Evans Date: Fri, 21 Jun 2013 06:34:33 -0400 Subject: [PATCH] Added FileTypeBox default constructor defaults. --- glymur/jp2box.py | 8 +++++++- glymur/test/test_jp2box.py | 7 +++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/glymur/jp2box.py b/glymur/jp2box.py index aa92f2a..bde8a67 100644 --- a/glymur/jp2box.py +++ b/glymur/jp2box.py @@ -596,8 +596,14 @@ class FileTypeBox(Jp2kBox): List of file conformance profiles. """ def __init__(self, **kwargs): - Jp2kBox.__init__(self, id='', longname='File Type') + Jp2kBox.__init__(self, id='ftyp', longname='File Type') self.__dict__.update(**kwargs) + if 'brand' not in kwargs.keys(): + self.brand = 'jp2 ' + if 'minor_version' not in kwargs.keys(): + self.minor_version = 0 + if 'compatibility_box' not in kwargs.keys(): + self.compatibility_box = ['jp2 '] def __str__(self): lst = [Jp2kBox.__str__(self), diff --git a/glymur/test/test_jp2box.py b/glymur/test/test_jp2box.py index 40b85b8..3dca867 100644 --- a/glymur/test/test_jp2box.py +++ b/glymur/test/test_jp2box.py @@ -21,6 +21,13 @@ class TestJp2Boxes(unittest.TestCase): b = glymur.jp2box.JPEG2000SignatureBox() self.assertEqual(b.signature, (13, 10, 135, 10)) + def test_default_FileTypeBox(self): + # Should be able to instantiate a FileTypeBox + b = glymur.jp2box.FileTypeBox() + self.assertEqual(b.brand, 'jp2 ') + self.assertEqual(b.minor_version, 0) + self.assertEqual(b.compatibility_box, ['jp2 ']) + if __name__ == "__main__": unittest.main()