From 4ac5b575d20c2ccdd8b0901d8cb1d2a0442a70e6 Mon Sep 17 00:00:00 2001 From: jevans Date: Mon, 22 Sep 2014 21:15:12 -0400 Subject: [PATCH 1/2] config module refactor --- glymur/lib/config.py | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/glymur/lib/config.py b/glymur/lib/config.py index fdb5a92..04aece2 100644 --- a/glymur/lib/config.py +++ b/glymur/lib/config.py @@ -73,7 +73,6 @@ def load_openjpeg(path): return load_library_handle(path) - def load_openjp2(path): """Load the openjp2 library, falling back on defaults if necessary. """ @@ -100,7 +99,7 @@ def load_openjp2(path): def load_library_handle(path): """Load the library, return the ctypes handle.""" - if path is None: + if path is None or path in ['None', 'none']: # Either could not find a library via ctypes or user-configuration-file, # or we could not find it in any of the default locations. # This is probably a very old linux. @@ -130,14 +129,11 @@ def read_config_file(): # Read the configuration file for the library location. parser = ConfigParser() parser.read(filename) - try: - lib['openjp2'] = parser.get('library', 'openjp2') - except NoOptionError: - pass - try: - lib['openjpeg'] = parser.get('library', 'openjpeg') - except NoOptionError: - pass + for name in ['openjp2', 'openjpeg']: + try: + lib[name] = parser.get('library', name) + except NoOptionError: + pass return lib @@ -150,8 +146,7 @@ def glymur_config(): libopenjpeg_handle = load_openjpeg(libs['openjpeg']) if libopenjp2_handle is None and libopenjpeg_handle is None: msg = "Neither the openjp2 nor the openjpeg library could be loaded. " - msg += "Operating in severely degraded mode." - warnings.warn(msg, UserWarning) + raise IOError(msg) return libopenjp2_handle, libopenjpeg_handle From d2dc37bd5e7b5c56048f80ce3ef33c6fda34087f Mon Sep 17 00:00:00 2001 From: jevans Date: Mon, 22 Sep 2014 21:15:49 -0400 Subject: [PATCH 2/2] fixed two bugs unknowingly introduced into cinema2k/4k testing --- glymur/test/test_opj_suite_write.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/glymur/test/test_opj_suite_write.py b/glymur/test/test_opj_suite_write.py index fa719fc..ebdce2e 100644 --- a/glymur/test/test_opj_suite_write.py +++ b/glymur/test/test_opj_suite_write.py @@ -24,8 +24,9 @@ from .fixtures import opj_data_file from .fixtures import WARNING_INFRASTRUCTURE_ISSUE, WARNING_INFRASTRUCTURE_MSG from . import fixtures -from glymur import Jp2k import glymur +from glymur import Jp2k +from glymur.codestream import SIZsegment class CinemaBase(fixtures.MetadataBase): @@ -45,7 +46,7 @@ class CinemaBase(fixtures.MetadataBase): 'xytsiz': image_size, 'xytosiz': (0, 0), 'bitdepth': (12, 12, 12), 'signed': (False, False, False), 'xyrsiz': [(1, 1, 1), (1, 1, 1)]} - self.verifySizSegment(c.segment[1], glymur.codestream.SIZsegment(**kwargs)) + self.verifySizSegment(codestream.segment[1], SIZsegment(**kwargs)) self.verify_cinema_cod(codestream.segment[2]) @@ -55,7 +56,7 @@ class CinemaBase(fixtures.MetadataBase): 'xytsiz': image_size, 'xytosiz': (0, 0), 'bitdepth': (12, 12, 12), 'signed': (False, False, False), 'xyrsiz': [(1, 1, 1), (1, 1, 1)]} - self.verifySizSegment(c.segment[1], glymur.codestream.SIZsegment(**kwargs)) + self.verifySizSegment(codestream.segment[1], SIZsegment(**kwargs)) self.verify_cinema_cod(codestream.segment[2])