diff --git a/docs/source/introduction.rst b/docs/source/introduction.rst index ffe21f7..9e0a688 100644 --- a/docs/source/introduction.rst +++ b/docs/source/introduction.rst @@ -18,18 +18,17 @@ Glymur works on Python 2.6, 2.7, and 3.3. Python 3.3 is strongly recommended. OpenJPEG Installation ===================== -The OpenJPEG library version must be either 1.4, 1.5, or the trunk/development -version of OpenJPEG. Version 2.0.0 or versions earlier than 1.4.0 +The OpenJPEG library version must be 1.3, 1.4, 1.5, or the trunk/development +version of OpenJPEG. Version 2.0.0 or versions earlier than 1.3.0 are not supported. Furthermore, the 1.4 and 1.5 versions of OpenJPEG are currently only utilized for read-only purposes. For more information about OpenJPEG, please consult http://www.openjpeg.org. If you use MacPorts on the mac or if you have a sufficiently recent version of -Linux, your package manager should already provide you with at least version -1.5.1 of OpenJPEG, which means that glymur can be installed ready to read JPEG -2000 images. If your platform is windows, I suggest using the 1.5.1 windows -installer provided to you by the OpenJPEG folks at -https://code.google.com/p/openjpeg/downloads/list . +Linux, your package manager should already provide you with a version +of OpenJPEG with which glymur can already use. If your platform is +windows, I suggest using the 1.5.1 windows installer provided to you by +the OpenJPEG folks at https://code.google.com/p/openjpeg/downloads/list . Glymur Installation =================== @@ -56,5 +55,5 @@ You can run the tests from within python as follows:: >>> glymur.runtests() Many tests are currently skipped; in fact most of them are skipped if you -are relying on OpenJPEG 1.4 or 1.5. But the important thing, though, is whether or +are relying on OpenJPEG 1.3, 1.4, or 1.5. The important thing, though, is whether or not any tests fail. diff --git a/glymur/lib/test/test_openjpeg.py b/glymur/lib/test/test_openjpeg.py index aed03f2..3dc7628 100644 --- a/glymur/lib/test/test_openjpeg.py +++ b/glymur/lib/test/test_openjpeg.py @@ -23,7 +23,7 @@ class TestOpenJPEG(unittest.TestCase): def test_version(self): version = glymur.lib._openjpeg.version() - regex = re.compile('1.[45].[0-9]') + regex = re.compile('1.[345].[0-9]') if sys.hexversion <= 0x03020000: self.assertRegexpMatches(version, regex) else: diff --git a/glymur/test/test_opj_suite.py b/glymur/test/test_opj_suite.py index ead37ef..9502901 100644 --- a/glymur/test/test_opj_suite.py +++ b/glymur/test/test_opj_suite.py @@ -7765,6 +7765,8 @@ class TestSuite15(unittest.TestCase): jpdata = jp2k.read() self.assertEqual(jpdata.shape, (400, 700)) + @unittest.skipIf(glymur.lib.openjpeg.version().startswith('1.3'), + "Version 1.3 reads palette images wrong.") def test_ETS_JP2_file9(self): jfile = os.path.join(data_root, 'input/conformance/file9.jp2') jp2k = Jp2k(jfile) diff --git a/release.txt b/release.txt index 4ad8693..e46d85a 100644 --- a/release.txt +++ b/release.txt @@ -1,30 +1,34 @@ -| OS | Python 2.7 | Python 3.3 | Notes | -+------------+------------+------------+--------------------------------------+ -| Windows | X | | Python(xy) with OpenJPEG 1.5.1. At | -| | | | least 155 of 444 tests should pass. | -+------------+------------+------------+--------------------------------------+ -| Windows | X | | Python(xy) with OpenJPEG 1.5.1 and | -| | | | OpenJPEG svn. At least 282 of 444 | -| | | | tests should pass. | -+------------+------------+------------+--------------------------------------+ -| Mac | X | | MacPorts with both OpenJPEG 1.5.1 | -| | | | and OpenJPEG svn. 370 of 450 tests | -| | | | should pass. | -+------------+------------+------------+--------------------------------------+ -| Mac | | X | MacPorts with both OpenJPEG 1.5.1 | -| | | | and OpenJPEG svn. 390 of 450 | -| | | | tests should pass. | -+------------+------------+------------+--------------------------------------+ -| Fedora 19 | | X | Ships with 1.5.1. 390 of 450 tests | -| | | | should pass. | -+------------+------------+------------+--------------------------------------+ -| Fedora 18 | | X | Ships with 1.5.1. 167 of 445 tests | -| | | | should pass. | -+------------+------------+------------+--------------------------------------+ -| Fedora 17 | X | | Ships with 1.4.0. 167 of 445 tests | -| | | | should pass. | -+------------+------------+------------+--------------------------------------+ +| OS | Python | Python | Python | Notes | +| | 2.6 | 2.7 | 3.3 | | ++---------+--------+--------+--------+---------------------------------------+ +| Windows | | X | | Python(xy) with OpenJPEG 1.5.1. At | +| | | | | least 155 of 444 tests should pass. | ++---------+--------+--------+--------+---------------------------------------+ +| Windows | | X | | Python(xy) with OpenJPEG 1.5.1 and | +| | | | | OpenJPEG svn. At least 282 of 444 | +| | | | | tests should pass. | ++---------+--------+--------+--------+---------------------------------------+ +| Mac | | X | | MacPorts with both OpenJPEG 1.5.1 | +| | | | | and OpenJPEG svn. 370 of 450 tests | +| | | | | should pass. | ++---------+--------+--------+--------+---------------------------------------+ +| Mac | | | X | MacPorts with both OpenJPEG 1.5.1 | +| | | | | and OpenJPEG svn. 390 of 450 | +| | | | | tests should pass. | ++---------+--------+--------+------------------------------------------------+ +| Fedora | | | X | Ships with 1.5.1. 390 of 450 tests | +| 19 | | | | should pass. | ++---------+--------+--------+--------+---------------------------------------+ +| Fedora | | | X | Ships with 1.5.1. 167 of 445 tests | +| 18 | | | | should pass. | ++---------+--------+--------+--------+---------------------------------------+ +| Fedora | | X | | Ships with 1.4.0. 167 of 445 tests | +| 17 | | | | should pass. | ++---------+--------+--------+--------+---------------------------------------+ +| CentOS | X | | | Ships with 1.3.0. 166 of 445 tests | +| 6.3 | | | | should pass. | ++---------+--------+--------+--------+---------------------------------------+ -Pylint on entire package should be at least 0.95. +Pylint on entire package should exceed 0.95. pep8 should be pass cleanly. Coverage should exceed 95%.