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

Merge branch 'master' into devel

Browse source
This commit is contained in:
jevans 2013-07-21 12:34:01 -04:00
commit f5a565d34b
5 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES.txt
View file

@ -1,3 +1,7 @@
Jul 21, 2013 - v0.2.4 Fixed markdown bug for Fedora 17 information, fixed
out-of-date windows information (issue79). Fixed incorrect
interpretation of Psot parameter (issue78).
Jul 18, 2013 - v0.2.3 Support for Python 2.6, OpenJPEG 1.4. Incompatible Jul 18, 2013 - v0.2.3 Support for Python 2.6, OpenJPEG 1.4. Incompatible
change to ChannelDefinitionBox constructor. Added RGBA example. change to ChannelDefinitionBox constructor. Added RGBA example.

2
docs/source/conf.py
View file

@ -78,7 +78,7 @@ copyright = u'2013, John Evans'
# The short X.Y version. # The short X.Y version.
version = '0.1' version = '0.1'
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
release = '0.2.3' release = '0.2.4'
# The language for content autogenerated by Sphinx. Refer to documentation # The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages. # for a list of supported languages.

4
glymur/test/test_opj_suite.py
View file

@ -7813,6 +7813,8 @@ class TestSuite15(unittest.TestCase):
data = jp2.read() data = jp2.read()
self.assertTrue(True) self.assertTrue(True)
@unittest.skipIf(int(glymur.lib.openjpeg.version().split('.')[1]) < 5,
"Segfaults openjpeg 1.4 and earlier.")
def test_NR_DEC_broken2_jp2_5_decode(self): def test_NR_DEC_broken2_jp2_5_decode(self):
# Null pointer access # Null pointer access
jfile = os.path.join(data_root, 'input/nonregression/broken2.jp2') jfile = os.path.join(data_root, 'input/nonregression/broken2.jp2')
@ -7834,6 +7836,8 @@ class TestSuite15(unittest.TestCase):
with self.assertRaises(ValueError) as ce: with self.assertRaises(ValueError) as ce:
d = j.read() d = j.read()
@unittest.skipIf(int(glymur.lib.openjpeg.version().split('.')[1]) < 5,
"Segfaults openjpeg 1.4 and earlier.")
def test_NR_DEC_broken4_jp2_7_decode(self): def test_NR_DEC_broken4_jp2_7_decode(self):
# Null pointer access # Null pointer access
jfile = os.path.join(data_root, 'input/nonregression/broken4.jp2') jfile = os.path.join(data_root, 'input/nonregression/broken4.jp2')

14
release.txt
View file

@ -6,30 +6,30 @@
| | | | | pass. | | | | | | pass. |
+-----------+--------+--------+--------+--------------------------------------+ +-----------+--------+--------+--------+--------------------------------------+
| Mac | X | | | MacPorts with both OpenJPEG 1.5.1 | | Mac | X | | | MacPorts with both OpenJPEG 1.5.1 |
| 10.6.8 | | | | and OpenJPEG svn. 353 of 449 tests | | 10.6.8 | | | | and OpenJPEG svn. 352 of 450 tests |
| | | | | should pass. | | | | | | should pass. |
+-----------+--------+--------+--------+--------------------------------------+ +-----------+--------+--------+--------+--------------------------------------+
| Mac | | X | | MacPorts with both OpenJPEG 1.5.1 | | Mac | | X | | MacPorts with both OpenJPEG 1.5.1 |
| 10.6.8 | | | | and OpenJPEG svn. 376 of 454 tests | | 10.6.8 | | | | and OpenJPEG svn. 377 of 455 tests |
| | | | | should pass. | | | | | | should pass. |
+-----------+--------+--------+--------+--------------------------------------+ +-----------+--------+--------+--------+--------------------------------------+
| Mac | | | X | MacPorts with both OpenJPEG 1.5.1 | | Mac | | | X | MacPorts with both OpenJPEG 1.5.1 |
| 10.6.8 | | | | and OpenJPEG svn. 401 of 454 | | 10.6.8 | | | | and OpenJPEG svn. 402 of 455 |
| | | | | tests should pass. | | | | | | tests should pass. |
+-----------+--------+--------+-----------------------------------------------+ +-----------+--------+--------+-----------------------------------------------+
| Fedora 19 | | | X | Ships with 1.5.1, openjp2 built too. | | Fedora 19 | | | X | Ships with 1.5.1, openjp2 built too. |
| | | | | 401 of 454 tests should pass. | | | | | | 402 of 455 tests should pass. |
+-----------+--------+--------+--------+--------------------------------------+ +-----------+--------+--------+--------+--------------------------------------+
| Fedora 18 | | | X | Ships with 1.5.1. 169 of 449 tests | | Fedora 18 | | | X | Ships with 1.5.1. 169 of 449 tests |
| | | | | should pass. | | | | | | should pass. |
+-----------+--------+--------+--------+--------------------------------------+ +-----------+--------+--------+--------+--------------------------------------+
| Fedora 17 | | X | | Ships with 1.4.0. 169 of 449 tests | | Fedora 17 | | X | | Ships with 1.4.0. 166 of 450 tests |
| | | | | should pass. | | | | | | should pass. |
+-----------+--------+--------+--------+--------------------------------------+ +-----------+--------+--------+--------+--------------------------------------+
| CentOS | X | | | Ships with 1.3.0. 167 of 449 tests | | CentOS | X | | | Ships with 1.3.0. 164 of 450 tests |
| 6.3 | | | | should pass. | | 6.3 | | | | should pass. |
+-----------+--------+--------+--------+--------------------------------------+ +-----------+--------+--------+--------+--------------------------------------+
| Raspberry | | X | | Ships with 1.3.0. 169 of 449 tests | | Raspberry | | X | | Ships with 1.3.0. 166 of 450 tests |
| Pi | | | | should pass. | | Pi | | | | should pass. |
| Debian 7 | | | | | | Debian 7 | | | | |
+-----------+--------+--------+--------+--------------------------------------+ +-----------+--------+--------+--------+--------------------------------------+

2
setup.py
View file

@ -2,7 +2,7 @@ from setuptools import setup, find_packages
import sys import sys
kwargs = {'name': 'Glymur', kwargs = {'name': 'Glymur',
'version': '0.2.3', 'version': '0.2.4',
'description': 'Tools for accessing JPEG2000 files', 'description': 'Tools for accessing JPEG2000 files',
'long_description': open('README.md').read(), 'long_description': open('README.md').read(),
'author': 'John Evans', 'author': 'John Evans',