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

Merge branch 'issue147' into devel

Browse source
This commit is contained in:
John Evans 2014-02-03 08:37:00 -05:00
commit 9fcdbb0ef8
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
glymur/test/test_jp2k.py
View file

@ -382,6 +382,10 @@ class TestJp2k(unittest.TestCase):
warnings.simplefilter("ignore") warnings.simplefilter("ignore")
jpx = Jp2k(self.jpxfile) jpx = Jp2k(self.jpxfile)
data = jpx.read() data = jpx.read()
if re.match(r"""1\.[0123]""", glymur.version.openjpeg_version):
# openjpeg 1.3 doesn't apply the palette, so it's a 2D image here
self.assertEqual(data.shape, (1024, 1024))
else:
self.assertEqual(data.shape, (1024, 1024, 3)) self.assertEqual(data.shape, (1024, 1024, 3))
@unittest.skipIf(os.name == "nt", "NamedTemporaryFile issue on windows") @unittest.skipIf(os.name == "nt", "NamedTemporaryFile issue on windows")