From bbc7808175469acdf95567abb3e16127f30648bc Mon Sep 17 00:00:00 2001 From: jevans Date: Tue, 20 Aug 2013 18:53:37 -0400 Subject: [PATCH 1/6] Moved TestConfig tests into config. Reworked two jp2k tests. The jp2k tests were relying on the OPJ_DATA_ROOT test files, which was not necessary. #105 --- glymur/test/test_config.py | 43 +++++++++++++++++++++++++++++++ glymur/test/test_jp2k.py | 52 ++------------------------------------ 2 files changed, 45 insertions(+), 50 deletions(-) diff --git a/glymur/test/test_config.py b/glymur/test/test_config.py index 3a70ee1..af95bd3 100644 --- a/glymur/test/test_config.py +++ b/glymur/test/test_config.py @@ -90,5 +90,48 @@ class TestSuite(unittest.TestCase): with self.assertWarns(UserWarning): imp.reload(glymur.lib.openjp2) + +@unittest.skipIf(glymur.lib.openjp2.OPENJP2 is None and + glymur.lib.openjpeg.OPENJPEG is None, + "Missing openjp2 library.") +class TestConfig(unittest.TestCase): + """Test suite for reading without proper library in place.""" + + def setUp(self): + self.jp2file = glymur.data.nemo() + self.j2kfile = glymur.data.goodstuff() + + def tearDown(self): + pass + + def test_read_without_library(self): + """Don't have either openjp2 or openjpeg libraries? Must error out. + """ + with patch('glymur.lib.openjp2.OPENJP2', new=None): + with patch('glymur.lib.openjpeg.OPENJPEG', new=None): + with self.assertRaises(glymur.jp2k.LibraryNotFoundError): + glymur.Jp2k(self.jp2file).read() + + def test_read_bands_without_library(self): + """Don't have openjp2 library? Must error out. + """ + with patch('glymur.lib.openjp2.OPENJP2', new=None): + with patch('glymur.lib.openjpeg.OPENJPEG', new=None): + with self.assertRaises(glymur.jp2k.LibraryNotFoundError): + glymur.Jp2k(self.jp2file).read_bands() + + @unittest.skipIf(os.name == "nt", "NamedTemporaryFile issue on windows") + def test_write_without_library(self): + """Don't have openjp2 library? Must error out. + """ + data = glymur.Jp2k(self.j2kfile).read() + with patch('glymur.lib.openjp2.OPENJP2', new=None): + with patch('glymur.lib.openjpeg.OPENJPEG', new=None): + with self.assertRaises(glymur.jp2k.LibraryNotFoundError): + with tempfile.NamedTemporaryFile(suffix='.jp2') as tfile: + ofile = Jp2k(tfile.name, 'wb') + ofile.write(data) + + if __name__ == "__main__": unittest.main() diff --git a/glymur/test/test_jp2k.py b/glymur/test/test_jp2k.py index 747782f..f44906e 100644 --- a/glymur/test/test_jp2k.py +++ b/glymur/test/test_jp2k.py @@ -65,48 +65,6 @@ def load_tests(loader, tests, ignore): return tests -@unittest.skipIf(glymur.lib.openjp2.OPENJP2 is None and - glymur.lib.openjpeg.OPENJPEG is None, - "Missing openjp2 library.") -class TestConfig(unittest.TestCase): - """Test suite for reading without proper library in place.""" - - def setUp(self): - self.jp2file = glymur.data.nemo() - self.j2kfile = glymur.data.goodstuff() - - def tearDown(self): - pass - - def test_read_without_library(self): - """Don't have either openjp2 or openjpeg libraries? Must error out. - """ - with patch('glymur.lib.openjp2.OPENJP2', new=None): - with patch('glymur.lib.openjpeg.OPENJPEG', new=None): - with self.assertRaises(glymur.jp2k.LibraryNotFoundError): - glymur.Jp2k(self.jp2file).read() - - def test_read_bands_without_library(self): - """Don't have openjp2 library? Must error out. - """ - with patch('glymur.lib.openjp2.OPENJP2', new=None): - with patch('glymur.lib.openjpeg.OPENJPEG', new=None): - with self.assertRaises(glymur.jp2k.LibraryNotFoundError): - glymur.Jp2k(self.jp2file).read_bands() - - @unittest.skipIf(os.name == "nt", "NamedTemporaryFile issue on windows") - def test_write_without_library(self): - """Don't have openjp2 library? Must error out. - """ - data = glymur.Jp2k(self.j2kfile).read() - with patch('glymur.lib.openjp2.OPENJP2', new=None): - with patch('glymur.lib.openjpeg.OPENJPEG', new=None): - with self.assertRaises(glymur.jp2k.LibraryNotFoundError): - with tempfile.NamedTemporaryFile(suffix='.jp2') as tfile: - ofile = Jp2k(tfile.name, 'wb') - ofile.write(data) - - @unittest.skipIf(os.name == "nt", "NamedTemporaryFile issue on windows") @unittest.skipIf(glymur.lib.openjp2.OPENJP2 is None, "Missing openjp2 library.") @@ -333,13 +291,10 @@ class TestJp2k(unittest.TestCase): self.assertEqual(jp2k.box[2].box[1].colorspace, glymur.core.SRGB) self.assertIsNone(jp2k.box[2].box[1].icc_profile) - @unittest.skipIf(DATA_ROOT is None, - "OPJ_DATA_ROOT environment variable not set") def test_j2k_box(self): """A J2K/J2C file must not have any boxes.""" # Verify that a J2K file has no boxes. - filename = os.path.join(DATA_ROOT, 'input/conformance/p0_01.j2k') - jp2k = Jp2k(filename) + jp2k = Jp2k(self.j2kfile) self.assertEqual(len(jp2k.box), 0) @unittest.skipIf(os.name == "nt", "NamedTemporaryFile issue on windows") @@ -425,14 +380,11 @@ class TestJp2k(unittest.TestCase): with self.assertRaises(RuntimeError): j.read() - @unittest.skipIf(DATA_ROOT is None, - "OPJ_DATA_ROOT environment variable not set") def test_empty_box_with_j2k(self): """Verify that the list of boxes in a J2C/J2K file is present, but empty. """ - filename = os.path.join(DATA_ROOT, 'input/conformance/p0_05.j2k') - j = Jp2k(filename) + j = Jp2k(self.j2kfile) self.assertEqual(j.box, []) @unittest.skipIf(os.name == "nt", "NamedTemporaryFile issue on windows") From 5c190e8d9e7c450c326e736c67f61e69977f84dc Mon Sep 17 00:00:00 2001 From: jevans Date: Tue, 20 Aug 2013 20:01:01 -0400 Subject: [PATCH 2/6] Added check for rlevel=-1 for openjpeg 1.5. Added 2.x tests to 1.5 suite. Closes #106 --- glymur/jp2k.py | 5 + glymur/test/test_jp2k.py | 617 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 622 insertions(+) diff --git a/glymur/jp2k.py b/glymur/jp2k.py index d5c604c..9623abc 100644 --- a/glymur/jp2k.py +++ b/glymur/jp2k.py @@ -636,6 +636,11 @@ class Jp2k(Jp2kBox): """ self._subsampling_sanity_check() + if rlevel == -1: + # Get the lowest resolution thumbnail. + codestream = self.get_codestream() + rlevel = codestream.segment[2].spcod[4] + with ExitStack() as stack: # Set decoding parameters. dparameters = opj.DecompressionParametersType() diff --git a/glymur/test/test_jp2k.py b/glymur/test/test_jp2k.py index f44906e..2ca5d9b 100644 --- a/glymur/test/test_jp2k.py +++ b/glymur/test/test_jp2k.py @@ -38,6 +38,7 @@ import glymur from glymur import Jp2k from .fixtures import OPENJP2_IS_V2_OFFICIAL +from .fixtures import OPENJPEG_VERSION try: DATA_ROOT = os.environ['OPJ_DATA_ROOT'] @@ -367,6 +368,18 @@ class TestJp2k(unittest.TestCase): self.assertEqual(new_jp2.box[j].length, baseline_jp2.box[j].length) + def test_basic_jp2(self): + """Just a very basic test that reading a JP2 file does not error out. + """ + j2k = Jp2k(self.jp2file) + j2k.read(rlevel=1) + + def test_basic_j2k(self): + """Just a very basic test that reading a J2K file does not error out. + """ + j2k = Jp2k(self.j2kfile) + j2k.read() + @unittest.skipIf(DATA_ROOT is None, "OPJ_DATA_ROOT environment variable not set") def test_read_differing_subsamples(self): @@ -772,6 +785,14 @@ class TestJp2k15(unittest.TestCase): def tearDown(self): pass + def test_rlevel_max(self): + """Verify that rlevel=-1 gets us the lowest resolution image""" + j = Jp2k(self.j2kfile) + thumbnail2 = j.read(rlevel=5) + thumbnail1 = j.read(rlevel=-1) + np.testing.assert_array_equal(thumbnail1, thumbnail2) + self.assertEqual(thumbnail1.shape, (25, 15, 3)) + def test_area(self): """Area option not allowed for 1.5.1. """ @@ -793,6 +814,215 @@ class TestJp2k15(unittest.TestCase): with self.assertRaises(TypeError): j2k.read(layer=1) + def test_rlevel_too_high(self): + """Should error out appropriately if reduce level too high""" + j = Jp2k(self.jp2file) + with self.assertRaises(ValueError): + j.read(rlevel=6) + + def test_not_jpeg2000(self): + """Should error out appropriately if not given a JPEG 2000 file.""" + filename = pkg_resources.resource_filename(glymur.__name__, "jp2k.py") + with self.assertRaises(IOError): + Jp2k(filename) + + def test_file_not_present(self): + """Should error out if reading from a file that does not exist""" + # Verify that we error out appropriately if not given an existing file + # at all. + with self.assertRaises(OSError): + filename = 'this file does not actually exist on the file system.' + Jp2k(filename) + + @unittest.skip("Writing requires openjp2 library at the moment.") + @unittest.skipIf(os.name == "nt", "NamedTemporaryFile issue on windows") + def test_write_with_jp2_in_caps(self): + """should be able to write with JP2 suffix.""" + j2k = Jp2k(self.j2kfile) + expdata = j2k.read() + with tempfile.NamedTemporaryFile(suffix='.JP2') as tfile: + ofile = Jp2k(tfile.name, 'wb') + ofile.write(expdata) + actdata = ofile.read() + np.testing.assert_array_equal(actdata, expdata) + + @unittest.skip("Writing requires openjp2 library at the moment.") + @unittest.skipIf(os.name == "nt", "NamedTemporaryFile issue on windows") + def test_write_srgb_without_mct(self): + """should be able to write RGB without specifying mct""" + j2k = Jp2k(self.j2kfile) + expdata = j2k.read() + with tempfile.NamedTemporaryFile(suffix='.jp2') as tfile: + ofile = Jp2k(tfile.name, 'wb') + ofile.write(expdata, mct=False) + actdata = ofile.read() + np.testing.assert_array_equal(actdata, expdata) + + codestream = ofile.get_codestream() + self.assertEqual(codestream.segment[2].spcod[3], 0) # no mct + + @unittest.skip("Writing requires openjp2 library at the moment.") + @unittest.skipIf(os.name == "nt", "NamedTemporaryFile issue on windows") + def test_write_grayscale_with_mct(self): + """MCT usage makes no sense for grayscale images.""" + j2k = Jp2k(self.j2kfile) + expdata = j2k.read() + with tempfile.NamedTemporaryFile(suffix='.jp2') as tfile: + ofile = Jp2k(tfile.name, 'wb') + with self.assertRaises(IOError): + ofile.write(expdata[:, :, 0], mct=True) + + @unittest.skip("Writing requires openjp2 library at the moment.") + @unittest.skipIf(os.name == "nt", "NamedTemporaryFile issue on windows") + def test_write_cprl(self): + """Must be able to write a CPRL progression order file""" + # Issue 17 + j = Jp2k(self.jp2file) + expdata = j.read(rlevel=1) + with tempfile.NamedTemporaryFile(suffix='.jp2') as tfile: + ofile = Jp2k(tfile.name, 'wb') + ofile.write(expdata, prog='CPRL') + actdata = ofile.read() + np.testing.assert_array_equal(actdata, expdata) + + codestream = ofile.get_codestream() + self.assertEqual(codestream.segment[2].spcod[0], glymur.core.CPRL) + + def test_jp2_boxes(self): + """Verify the boxes of a JP2 file. Basic jp2 test.""" + jp2k = Jp2k(self.jp2file) + + # top-level boxes + self.assertEqual(len(jp2k.box), 6) + + self.assertEqual(jp2k.box[0].box_id, 'jP ') + self.assertEqual(jp2k.box[0].offset, 0) + self.assertEqual(jp2k.box[0].length, 12) + self.assertEqual(jp2k.box[0].longname, 'JPEG 2000 Signature') + + self.assertEqual(jp2k.box[1].box_id, 'ftyp') + self.assertEqual(jp2k.box[1].offset, 12) + self.assertEqual(jp2k.box[1].length, 20) + self.assertEqual(jp2k.box[1].longname, 'File Type') + + self.assertEqual(jp2k.box[2].box_id, 'jp2h') + self.assertEqual(jp2k.box[2].offset, 32) + self.assertEqual(jp2k.box[2].length, 45) + self.assertEqual(jp2k.box[2].longname, 'JP2 Header') + + self.assertEqual(jp2k.box[3].box_id, 'uuid') + self.assertEqual(jp2k.box[3].offset, 77) + self.assertEqual(jp2k.box[3].length, 638) + + self.assertEqual(jp2k.box[4].box_id, 'uuid') + self.assertEqual(jp2k.box[4].offset, 715) + self.assertEqual(jp2k.box[4].length, 2412) + + self.assertEqual(jp2k.box[5].box_id, 'jp2c') + self.assertEqual(jp2k.box[5].offset, 3127) + self.assertEqual(jp2k.box[5].length, 1132296) + + # jp2h super box + self.assertEqual(len(jp2k.box[2].box), 2) + + self.assertEqual(jp2k.box[2].box[0].box_id, 'ihdr') + self.assertEqual(jp2k.box[2].box[0].offset, 40) + self.assertEqual(jp2k.box[2].box[0].length, 22) + self.assertEqual(jp2k.box[2].box[0].longname, 'Image Header') + self.assertEqual(jp2k.box[2].box[0].height, 1456) + self.assertEqual(jp2k.box[2].box[0].width, 2592) + self.assertEqual(jp2k.box[2].box[0].num_components, 3) + self.assertEqual(jp2k.box[2].box[0].bits_per_component, 8) + self.assertEqual(jp2k.box[2].box[0].signed, False) + self.assertEqual(jp2k.box[2].box[0].compression, 7) + self.assertEqual(jp2k.box[2].box[0].colorspace_unknown, False) + self.assertEqual(jp2k.box[2].box[0].ip_provided, False) + + self.assertEqual(jp2k.box[2].box[1].box_id, 'colr') + self.assertEqual(jp2k.box[2].box[1].offset, 62) + self.assertEqual(jp2k.box[2].box[1].length, 15) + self.assertEqual(jp2k.box[2].box[1].longname, 'Colour Specification') + self.assertEqual(jp2k.box[2].box[1].precedence, 0) + self.assertEqual(jp2k.box[2].box[1].approximation, 0) + self.assertEqual(jp2k.box[2].box[1].colorspace, glymur.core.SRGB) + self.assertIsNone(jp2k.box[2].box[1].icc_profile) + + def test_j2k_box(self): + """A J2K/J2C file must not have any boxes.""" + # Verify that a J2K file has no boxes. + jp2k = Jp2k(self.j2kfile) + self.assertEqual(len(jp2k.box), 0) + + @unittest.skipIf(os.name == "nt", "NamedTemporaryFile issue on windows") + def test_64bit_xl_field(self): + """XL field should be supported""" + # Verify that boxes with the XL field are properly read. + # Don't have such a file on hand, so we create one. Copy our example + # file, but making the codestream have a 64-bit XL field. + with tempfile.NamedTemporaryFile(suffix='.jp2') as tfile: + with open(self.jp2file, 'rb') as ifile: + # Everything up until the jp2c box. + write_buffer = ifile.read(3127) + tfile.write(write_buffer) + + # The L field must be 1 in order to signal the presence of the + # XL field. The actual length of the jp2c box increased by 8 + # (8 bytes for the XL field). + length = 1 + typ = b'jp2c' + xlen = 1133427 + 8 + write_buffer = struct.pack('>I4sQ', int(length), typ, xlen) + tfile.write(write_buffer) + + # Get the rest of the input file (minus the 8 bytes for L and + # T. + ifile.seek(8, 1) + write_buffer = ifile.read() + tfile.write(write_buffer) + tfile.flush() + + jp2k = Jp2k(tfile.name) + + self.assertEqual(jp2k.box[5].box_id, 'jp2c') + self.assertEqual(jp2k.box[5].offset, 3127) + self.assertEqual(jp2k.box[5].length, 1133427 + 8) + + @unittest.skipIf(os.name == "nt", "NamedTemporaryFile issue on windows") + def test_length_field_is_zero(self): + """L=0 (length field in box header) is allowed""" + # Verify that boxes with the L field as zero are correctly read. + # This should only happen in the last box of a JPEG 2000 file. + # Our example image has its last box at byte 588458. + baseline_jp2 = Jp2k(self.jp2file) + with tempfile.NamedTemporaryFile(suffix='.jp2') as tfile: + with open(self.jp2file, 'rb') as ifile: + # Everything up until the jp2c box. + write_buffer = ifile.read(588458) + tfile.write(write_buffer) + + length = 0 + typ = b'uuid' + write_buffer = struct.pack('>I4s', int(length), typ) + tfile.write(write_buffer) + + # Get the rest of the input file (minus the 8 bytes for L and + # T. + ifile.seek(8, 1) + write_buffer = ifile.read() + tfile.write(write_buffer) + tfile.flush() + + new_jp2 = Jp2k(tfile.name) + + # The top level boxes in each file should match. + for j in range(len(baseline_jp2.box)): + self.assertEqual(new_jp2.box[j].box_id, + baseline_jp2.box[j].box_id) + self.assertEqual(new_jp2.box[j].offset, + baseline_jp2.box[j].offset) + self.assertEqual(new_jp2.box[j].length, + baseline_jp2.box[j].length) + def test_basic_jp2(self): """This test is only useful when openjp2 is not available and OPJ_DATA_ROOT is not set. We need at least one @@ -809,6 +1039,393 @@ class TestJp2k15(unittest.TestCase): j2k = Jp2k(self.j2kfile) j2k.read() + @unittest.skipIf(DATA_ROOT is None, + "OPJ_DATA_ROOT environment variable not set") + def test_read_differing_subsamples(self): + """should error out with read used on differently subsampled images""" + # Verify that we error out appropriately if we use the read method + # on an image with differing subsamples + # + # Issue 86. + filename = os.path.join(DATA_ROOT, 'input/conformance/p0_05.j2k') + j = Jp2k(filename) + with self.assertRaises(RuntimeError): + j.read() + + def test_empty_box_with_j2k(self): + """Verify that the list of boxes in a J2C/J2K file is present, but + empty. + """ + j = Jp2k(self.j2kfile) + self.assertEqual(j.box, []) + + @unittest.skip("Writing requires openjp2 library at the moment.") + @unittest.skipIf(os.name == "nt", "NamedTemporaryFile issue on windows") + def test_cblkh_different_than_width(self): + """Verify that we can set a code block size where height does not equal + width. + """ + data = np.zeros((128, 128), dtype=np.uint8) + with tempfile.NamedTemporaryFile(suffix='.j2k') as tfile: + j = Jp2k(tfile.name, 'wb') + + # The code block dimensions are given as rows x columns. + j.write(data, cbsize=(16, 32)) + + codestream = j.get_codestream() + + # Code block size is reported as XY in the codestream. + self.assertEqual(tuple(codestream.segment[2].spcod[5:7]), (3, 2)) + + @unittest.skipIf(os.name == "nt", "NamedTemporaryFile issue on windows") + def test_too_many_dimensions(self): + """OpenJP2 only allows 2D or 3D images.""" + with tempfile.NamedTemporaryFile(suffix='.j2k') as tfile: + j = Jp2k(tfile.name, 'wb') + with self.assertRaises(IOError): + data = np.zeros((128, 128, 2, 2), dtype=np.uint8) + j.write(data) + + @unittest.skipIf(os.name == "nt", "NamedTemporaryFile issue on windows") + def test_unrecognized_jp2_clrspace(self): + """We only allow RGB and GRAYSCALE. Should error out with others""" + with tempfile.NamedTemporaryFile(suffix='.jp2') as tfile: + j = Jp2k(tfile.name, 'wb') + with self.assertRaises(IOError): + data = np.zeros((128, 128, 3), dtype=np.uint8) + j.write(data, colorspace='cmyk') + + @unittest.skipIf(os.name == "nt", "NamedTemporaryFile issue on windows") + def test_2d_rgb(self): + """RGB must have at least 3 components.""" + with tempfile.NamedTemporaryFile(suffix='.jp2') as tfile: + j = Jp2k(tfile.name, 'wb') + with self.assertRaises(IOError): + data = np.zeros((128, 128, 2), dtype=np.uint8) + j.write(data, colorspace='rgb') + + @unittest.skip("Writing requires openjp2 library at the moment.") + @unittest.skipIf(os.name == "nt", "NamedTemporaryFile issue on windows") + def test_colorspace_with_j2k(self): + """Specifying a colorspace with J2K does not make sense""" + with tempfile.NamedTemporaryFile(suffix='.j2k') as tfile: + j = Jp2k(tfile.name, 'wb') + with self.assertRaises(IOError): + data = np.zeros((128, 128, 3), dtype=np.uint8) + j.write(data, colorspace='rgb') + + @unittest.skip("Writing requires openjp2 library at the moment.") + @unittest.skipIf(os.name == "nt", "NamedTemporaryFile issue on windows") + def test_specify_rgb(self): + """specify RGB explicitly""" + with tempfile.NamedTemporaryFile(suffix='.jp2') as tfile: + j = Jp2k(tfile.name, 'wb') + data = np.zeros((128, 128, 3), dtype=np.uint8) + j.write(data, colorspace='rgb') + self.assertEqual(j.box[2].box[1].colorspace, glymur.core.SRGB) + + @unittest.skip("Writing requires openjp2 library at the moment.") + @unittest.skipIf(os.name == "nt", "NamedTemporaryFile issue on windows") + def test_specify_gray(self): + """test gray explicitly specified (that's GRAY, not GREY)""" + with tempfile.NamedTemporaryFile(suffix='.jp2') as tfile: + j = Jp2k(tfile.name, 'wb') + data = np.zeros((128, 128), dtype=np.uint8) + j.write(data, colorspace='gray') + self.assertEqual(j.box[2].box[1].colorspace, + glymur.core.GREYSCALE) + + @unittest.skip("Writing requires openjp2 library at the moment.") + @unittest.skipIf(os.name == "nt", "NamedTemporaryFile issue on windows") + def test_specify_grey(self): + """test grey explicitly specified""" + with tempfile.NamedTemporaryFile(suffix='.jp2') as tfile: + j = Jp2k(tfile.name, 'wb') + data = np.zeros((128, 128), dtype=np.uint8) + j.write(data, colorspace='grey') + self.assertEqual(j.box[2].box[1].colorspace, + glymur.core.GREYSCALE) + + @unittest.skip("Writing requires openjp2 library at the moment.") + @unittest.skipIf(os.name == "nt", "NamedTemporaryFile issue on windows") + def test_grey_with_extra_component(self): + """version 2.0 cannot write gray + extra""" + with tempfile.NamedTemporaryFile(suffix='.jp2') as tfile: + j = Jp2k(tfile.name, 'wb') + data = np.zeros((128, 128, 2), dtype=np.uint8) + j.write(data) + self.assertEqual(j.box[2].box[0].height, 128) + self.assertEqual(j.box[2].box[0].width, 128) + self.assertEqual(j.box[2].box[0].num_components, 2) + self.assertEqual(j.box[2].box[1].colorspace, + glymur.core.GREYSCALE) + + @unittest.skip("Writing requires openjp2 library at the moment.") + @unittest.skipIf(os.name == "nt", "NamedTemporaryFile issue on windows") + def test_grey_with_two_extra_comps(self): + """should be able to write gray + two extra components""" + with tempfile.NamedTemporaryFile(suffix='.jp2') as tfile: + j = Jp2k(tfile.name, 'wb') + data = np.zeros((128, 128, 3), dtype=np.uint8) + j.write(data, colorspace='gray') + self.assertEqual(j.box[2].box[0].height, 128) + self.assertEqual(j.box[2].box[0].width, 128) + self.assertEqual(j.box[2].box[0].num_components, 3) + self.assertEqual(j.box[2].box[1].colorspace, + glymur.core.GREYSCALE) + + @unittest.skip("Writing requires openjp2 library at the moment.") + @unittest.skipIf(os.name == "nt", "NamedTemporaryFile issue on windows") + def test_rgb_with_extra_component(self): + """v2.0+ should be able to write extra components""" + with tempfile.NamedTemporaryFile(suffix='.jp2') as tfile: + j = Jp2k(tfile.name, 'wb') + data = np.zeros((128, 128, 4), dtype=np.uint8) + j.write(data) + self.assertEqual(j.box[2].box[0].height, 128) + self.assertEqual(j.box[2].box[0].width, 128) + self.assertEqual(j.box[2].box[0].num_components, 4) + self.assertEqual(j.box[2].box[1].colorspace, glymur.core.SRGB) + + @unittest.skip("Writing requires openjp2 library at the moment.") + @unittest.skipIf(os.name == "nt", "NamedTemporaryFile issue on windows") + def test_extra_components_on_v2(self): + """must error out in 1.x with extra components.""" + # Extra components seems to require 2.0+. Verify that we error out. + with self.assertRaises(IOError): + with tempfile.NamedTemporaryFile(suffix='.jp2') as tfile: + j = Jp2k(tfile.name, 'wb') + data = np.zeros((128, 128, 4), dtype=np.uint8) + j.write(data) + + @unittest.skip("Writing requires openjp2 library at the moment.") + def test_specify_ycc(self): + """Should reject YCC""" + with tempfile.NamedTemporaryFile(suffix='.jp2') as tfile: + j = Jp2k(tfile.name, 'wb') + with self.assertRaises(IOError): + data = np.zeros((128, 128, 3), dtype=np.uint8) + j.write(data, colorspace='ycc') + + @unittest.skipIf(os.name == "nt", "NamedTemporaryFile issue on windows") + def test_uinf_ulst_url_boxes(self): + """Verify that we can read UINF, ULST, and URL boxes""" + # Verify that we can read UINF, ULST, and URL boxes. I don't have + # easy access to such a file, and there's no such file in the + # openjpeg repository, so I'll fake one. + with tempfile.NamedTemporaryFile(suffix='.jp2') as tfile: + with open(self.jp2file, 'rb') as ifile: + # Everything up until the jp2c box. + write_buffer = ifile.read(77) + tfile.write(write_buffer) + + # Write the UINF superbox + # Length = 50, id is uinf. + write_buffer = struct.pack('>I4s', int(50), b'uinf') + tfile.write(write_buffer) + + # Write the ULST box. + # Length is 26, 1 UUID, hard code that UUID as zeros. + write_buffer = struct.pack('>I4sHIIII', int(26), b'ulst', + int(1), int(0), int(0), int(0), + int(0)) + tfile.write(write_buffer) + + # Write the URL box. + # Length is 16, version is one byte, flag is 3 bytes, url + # is the rest. + write_buffer = struct.pack('>I4sBBBB', + int(16), b'url ', + int(0), int(0), int(0), int(0)) + tfile.write(write_buffer) + write_buffer = struct.pack('>ssss', b'a', b'b', b'c', b'd') + tfile.write(write_buffer) + + # Get the rest of the input file. + write_buffer = ifile.read() + tfile.write(write_buffer) + tfile.flush() + + jp2k = Jp2k(tfile.name) + + self.assertEqual(jp2k.box[3].box_id, 'uinf') + self.assertEqual(jp2k.box[3].offset, 77) + self.assertEqual(jp2k.box[3].length, 50) + + self.assertEqual(jp2k.box[3].box[0].box_id, 'ulst') + self.assertEqual(jp2k.box[3].box[0].offset, 85) + self.assertEqual(jp2k.box[3].box[0].length, 26) + ulst = [] + ulst.append(uuid.UUID('00000000-0000-0000-0000-000000000000')) + self.assertEqual(jp2k.box[3].box[0].ulst, ulst) + + self.assertEqual(jp2k.box[3].box[1].box_id, 'url ') + self.assertEqual(jp2k.box[3].box[1].offset, 111) + self.assertEqual(jp2k.box[3].box[1].length, 16) + self.assertEqual(jp2k.box[3].box[1].version, 0) + self.assertEqual(jp2k.box[3].box[1].flag, (0, 0, 0)) + self.assertEqual(jp2k.box[3].box[1].url, 'abcd') + + @unittest.skipIf(os.name == "nt", "NamedTemporaryFile issue on windows") + def test_xml_with_trailing_nulls(self): + """ElementTree doesn't like trailing null chars after valid XML text""" + with tempfile.NamedTemporaryFile(suffix='.jp2') as tfile: + with open(self.jp2file, 'rb') as ifile: + # Everything up until the jp2c box. + write_buffer = ifile.read(77) + tfile.write(write_buffer) + + # Write the xml box + # Length = 36, id is 'xml '. + write_buffer = struct.pack('>I4s', int(36), b'xml ') + tfile.write(write_buffer) + + write_buffer = 'this is a test' + chr(0) + write_buffer = write_buffer.encode() + tfile.write(write_buffer) + + # Get the rest of the input file. + write_buffer = ifile.read() + tfile.write(write_buffer) + tfile.flush() + + jp2k = Jp2k(tfile.name) + + self.assertEqual(jp2k.box[3].box_id, 'xml ') + self.assertEqual(jp2k.box[3].offset, 77) + self.assertEqual(jp2k.box[3].length, 36) + self.assertEqual(ET.tostring(jp2k.box[3].xml.getroot()), + b'this is a test') + + @unittest.skip("Writing requires openjp2 library at the moment.") + @unittest.skipIf(os.name == "nt", "NamedTemporaryFile issue on windows") + def test_asoc_label_box(self): + """Test asoc and label box""" + # Construct a fake file with an asoc and a label box, as + # OpenJPEG doesn't have such a file. + data = Jp2k(self.jp2file).read(rlevel=1) + with tempfile.NamedTemporaryFile(suffix='.jp2') as tfile: + j = Jp2k(tfile.name, 'wb') + j.write(data) + + with tempfile.NamedTemporaryFile(suffix='.jp2') as tfile2: + + # Offset of the codestream is where we start. + read_buffer = tfile.read(77) + tfile2.write(read_buffer) + + # read the rest of the file, it's the codestream. + codestream = tfile.read() + + # Write the asoc superbox. + # Length = 36, id is 'asoc'. + write_buffer = struct.pack('>I4s', int(56), b'asoc') + tfile2.write(write_buffer) + + # Write the contained label box + write_buffer = struct.pack('>I4s', int(13), b'lbl ') + tfile2.write(write_buffer) + tfile2.write('label'.encode()) + + # Write the xml box + # Length = 36, id is 'xml '. + write_buffer = struct.pack('>I4s', int(35), b'xml ') + tfile2.write(write_buffer) + + write_buffer = 'this is a test' + write_buffer = write_buffer.encode() + tfile2.write(write_buffer) + + # Now append the codestream. + tfile2.write(codestream) + tfile2.flush() + + jasoc = Jp2k(tfile2.name) + self.assertEqual(jasoc.box[3].box_id, 'asoc') + self.assertEqual(jasoc.box[3].box[0].box_id, 'lbl ') + self.assertEqual(jasoc.box[3].box[0].label, 'label') + self.assertEqual(jasoc.box[3].box[1].box_id, 'xml ') + + @unittest.skipIf(os.name == "nt", "NamedTemporaryFile issue on windows") + @unittest.skipIf(re.match('1\.[345]\.\d', OPENJPEG_VERSION) is not None, + "Segfault on official v1.x series.") + def test_openjpeg_library_message(self): + """Verify the error message produced by the openjpeg library""" + # This will confirm that the error callback mechanism is working. + with open(self.jp2file, 'rb') as fptr: + data = fptr.read() + with tempfile.NamedTemporaryFile(suffix='.jp2') as tfile: + # Codestream starts at byte 3127. SIZ marker at 3137. + # COD marker at 3186. Subsampling at 3180. + tfile.write(data[0:3179]) + + # Make the DY bytes of the SIZ segment zero. That means that + # a subsampling factor is zero, which is illegal. + tfile.write(b'\x00') + tfile.write(data[3180:3182]) + tfile.write(b'\x00') + tfile.write(data[3184:3186]) + tfile.write(b'\x00') + + tfile.write(data[3186:]) + tfile.flush() + with warnings.catch_warnings(): + warnings.simplefilter("ignore") + j = Jp2k(tfile.name) + regexp = re.compile(r'''OpenJPEG\slibrary\serror:\s+ + Invalid\svalues\sfor\scomp\s=\s0\s+ + :\sdx=1\sdy=0''', re.VERBOSE) + if sys.hexversion < 0x03020000: + with self.assertRaisesRegexp((IOError, OSError), regexp): + j.read(rlevel=1) + else: + with self.assertRaisesRegex((IOError, OSError), regexp): + j.read(rlevel=1) + + def test_xmp_attribute(self): + """Verify the XMP packet in the shipping example file can be read.""" + j = Jp2k(self.jp2file) + xmp = j.box[4].data + ns0 = '{http://www.w3.org/1999/02/22-rdf-syntax-ns#}' + ns1 = '{http://ns.adobe.com/xap/1.0/}' + name = '{0}RDF/{0}Description'.format(ns0) + elt = xmp.find(name) + attr_value = elt.attrib['{0}CreatorTool'.format(ns1)] + self.assertEqual(attr_value, 'glymur') + + @unittest.skipIf(os.name == "nt", "NamedTemporaryFile issue on windows") + def test_unrecognized_exif_tag(self): + """An unrecognized exif tag should be handled gracefully.""" + with tempfile.NamedTemporaryFile(suffix='.jp2') as tfile: + shutil.copyfile(self.jp2file, tfile.name) + + # The Exif UUID starts at byte 77. There are 8 bytes for the L and + # T fields, then 16 bytes for the UUID identifier, then 6 exif + # header bytes, then 8 bytes for the TIFF header, then 2 bytes + # the the Image IFD number of tags, where we finally find the first + # tag, "Make" (271). We'll corrupt it by changing it into 171, + # which does not correspond to any known Exif Image tag. + with open(tfile.name, 'r+b') as fptr: + fptr.seek(117) + write_buffer = struct.pack(' Date: Tue, 20 Aug 2013 20:23:51 -0400 Subject: [PATCH 3/6] Trying to install debs for numpy and matplotlib instead of pip --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0ff068a..c1c3b39 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,11 +6,13 @@ python: before_install: - sudo apt-get update -qq - sudo apt-get install -qq libopenjpeg2 + - sudo apt-get install -qq numpy + - sudo apt-get install -qq matplotlib # command to install dependencies +# - pip install numpy -q --use-mirrors +# - pip install matplotlib --use-mirrors install: - - pip install numpy -q --use-mirrors - - pip install matplotlib --use-mirrors - pip install . --use-mirrors # command to run tests script: From b7e589c7819aaadf7dce3a83bf76465895f12e38 Mon Sep 17 00:00:00 2001 From: jevans Date: Tue, 20 Aug 2013 20:36:03 -0400 Subject: [PATCH 4/6] Don't need matplotlib yet, try python-numpy instead of numpy. --- .travis.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index c1c3b39..3e6ca20 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,13 +6,11 @@ python: before_install: - sudo apt-get update -qq - sudo apt-get install -qq libopenjpeg2 - - sudo apt-get install -qq numpy - - sudo apt-get install -qq matplotlib + - sudo apt-get install -qq python-numpy # command to install dependencies -# - pip install numpy -q --use-mirrors -# - pip install matplotlib --use-mirrors install: + - pip install numpy -q --use-mirrors - pip install . --use-mirrors # command to run tests script: From 08578115f625d4288ed491d36f19c5b54342dcc9 Mon Sep 17 00:00:00 2001 From: jevans Date: Tue, 20 Aug 2013 20:45:47 -0400 Subject: [PATCH 5/6] No need to use apt-get with numpy, and then also install with pip still on #105 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3e6ca20..30dd864 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,10 +7,10 @@ before_install: - sudo apt-get update -qq - sudo apt-get install -qq libopenjpeg2 - sudo apt-get install -qq python-numpy + - sudo apt-get install -qq python3-numpy # command to install dependencies install: - - pip install numpy -q --use-mirrors - pip install . --use-mirrors # command to run tests script: From 009bd647726b3291115bb20b2633be52ae426cd4 Mon Sep 17 00:00:00 2001 From: John Evans Date: Tue, 20 Aug 2013 22:10:38 -0400 Subject: [PATCH 6/6] Must explicitly check max rlevel on 1.x versions of library. Otherwise it errors badly on 1.5, segfaults on 1.3. Closes #106. --- glymur/jp2k.py | 14 +++++++++++--- glymur/test/test_jp2k.py | 2 +- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/glymur/jp2k.py b/glymur/jp2k.py index 9623abc..bd90dfe 100644 --- a/glymur/jp2k.py +++ b/glymur/jp2k.py @@ -636,10 +636,18 @@ class Jp2k(Jp2kBox): """ self._subsampling_sanity_check() - if rlevel == -1: - # Get the lowest resolution thumbnail. + if rlevel != 0: + # Must check the specified rlevel against the maximum. + # OpenJPEG 1.3 will segfault if rlevel is too high. codestream = self.get_codestream() - rlevel = codestream.segment[2].spcod[4] + max_rlevel = codestream.segment[2].spcod[4] + if rlevel == -1: + # -1 is shorthand for the largest rlevel + rlevel = max_rlevel + if rlevel < -1 or rlevel > max_rlevel: + msg = "rlevel must be in the range [-1, {0}] for this image." + msg = msg.format(max_rlevel) + raise IOError(msg) with ExitStack() as stack: # Set decoding parameters. diff --git a/glymur/test/test_jp2k.py b/glymur/test/test_jp2k.py index 2ca5d9b..ea19199 100644 --- a/glymur/test/test_jp2k.py +++ b/glymur/test/test_jp2k.py @@ -817,7 +817,7 @@ class TestJp2k15(unittest.TestCase): def test_rlevel_too_high(self): """Should error out appropriately if reduce level too high""" j = Jp2k(self.jp2file) - with self.assertRaises(ValueError): + with self.assertRaises(IOError): j.read(rlevel=6) def test_not_jpeg2000(self):