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

Merge branch 'v1.3' into devel

Browse source
This commit is contained in:
John Evans 2013-07-14 07:34:22 -04:00
commit c5c04aab32
3 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
glymur/__init__.py
View file

@ -11,6 +11,9 @@ from . import test
def runtests(): def runtests():
"""Discover and run all tests for the glymur package. """Discover and run all tests for the glymur package.
""" """
import unittest if sys.hexversion <= 0x02070000:
import unittest2 as unittest
else:
import unittest
suite = unittest.defaultTestLoader.discover(__path__[0]) suite = unittest.defaultTestLoader.discover(__path__[0])
unittest.TextTestRunner(verbosity=2).run(suite) unittest.TextTestRunner(verbosity=2).run(suite)

7
glymur/test/test_opj_suite.py
View file

@ -7765,13 +7765,14 @@ class TestSuite15(unittest.TestCase):
jpdata = jp2k.read() jpdata = jp2k.read()
self.assertEqual(jpdata.shape, (400, 700)) 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): def test_ETS_JP2_file9(self):
jfile = os.path.join(data_root, 'input/conformance/file9.jp2') jfile = os.path.join(data_root, 'input/conformance/file9.jp2')
jp2k = Jp2k(jfile) jp2k = Jp2k(jfile)
jpdata = jp2k.read() jpdata = jp2k.read()
self.assertEqual(jpdata.shape, (512, 768, 3)) if glymur.lib.openjpeg.version().startswith('1.3'):
self.assertEqual(jpdata.shape, (512, 768))
else:
self.assertEqual(jpdata.shape, (512, 768, 3))
def test_NR_DEC_Bretagne2_j2k_1_decode(self): def test_NR_DEC_Bretagne2_j2k_1_decode(self):
jfile = os.path.join(data_root, jfile = os.path.join(data_root,

2
release.txt
View file

@ -25,7 +25,7 @@
| Fedora | | X | | Ships with 1.4.0. 167 of 445 tests | | Fedora | | X | | Ships with 1.4.0. 167 of 445 tests |
| 17 | | | | should pass. | | 17 | | | | should pass. |
+---------+--------+--------+--------+---------------------------------------+ +---------+--------+--------+--------+---------------------------------------+
| CentOS | X | | | Ships with 1.3.0. 166 of 445 tests | | CentOS | X | | | Ships with 1.3.0. 165 of 445 tests |
| 6.3 | | | | should pass. | | 6.3 | | | | should pass. |
+---------+--------+--------+--------+---------------------------------------+ +---------+--------+--------+--------+---------------------------------------+