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

Abstracted out loading of openjp2, openjpeg libraries. #138

Browse source 
That much was common to both load_openjp2 and load_openjpeg.  Reduces
number of different moving parts.
This commit is contained in:
jevans 2013-10-28 20:04:17 -04:00
commit 14d4b60896
1 changed files with 39 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

85
glymur/lib/config.py
View file

@ -54,27 +54,55 @@ def load_openjpeg(libopenjpeg_path):
# and win. # and win.
if libopenjpeg_path is None: if libopenjpeg_path is None:
if platform.system() == 'Darwin': if platform.system() == 'Darwin':
if os.path.exists('/opt/local/lib/libopenjpeg.dylib'): # MacPorts
libopenjpeg_path = '/opt/local/lib/libopenjpeg.dylib' path = '/opt/local/lib/libopenjpeg.dylib'
elif os.name == 'nt': elif os.name == 'nt':
path = os.path.join('C:\\', 'Program files', 'OpenJPEG 1.5', path = os.path.join('C:\\', 'Program files', 'OpenJPEG 1.5',
'bin', 'openjpeg.dll') 'bin', 'openjpeg.dll')
if os.path.exists(path): if os.path.exists(path):
libopenjpeg_path = path libopenjpeg_path = path
# If still no location, then no bother going further. return load_library(libopenjpeg_path)
if libopenjpeg_path is None:
def load_openjp2(libopenjp2_path):
"""Load the openjp2 library, falling back on defaults if necessary.
"""
if libopenjp2_path is None:
# No help from the config file, try to find it ourselves.
libopenjp2_path = find_library('openjp2')
if libopenjp2_path is None:
if platform.system() == 'Darwin':
# MacPorts
path = '/opt/local/lib/libopenjp2.dylib'
elif os.name == 'nt':
path = os.path.join('C:\\', 'Program files', 'OpenJPEG 2.0',
'bin', 'openjp2.dll')
if os.path.exists(path):
libopenjp2_path = path
return load_library(libopenjp2_path)
def load_library(path):
"""Load the library, return the ctypes handle."""
if path is None:
return None return None
try: try:
if os.name == "nt": if os.name == "nt":
openjpeg_lib = ctypes.windll.LoadLibrary(libopenjpeg_path) opj_lib = ctypes.windll.LoadLibrary(path)
else: else:
openjpeg_lib = ctypes.CDLL(libopenjpeg_path) opj_lib = ctypes.CDLL(path)
except OSError: except (TypeError, OSError):
openjpeg_lib = None msg = '"Library {0}" could not be loaded. Operating in degraded mode.'
msg = msg.format(path)
warnings.warn(msg, UserWarning)
opj_lib = None
return openjpeg_lib return opj_lib
def read_config_file(): def read_config_file():
@ -99,41 +127,6 @@ def read_config_file():
return lib return lib
def load_openjp2(libopenjp2_path):
"""Load the openjp2 library, falling back on defaults if necessary.
"""
if libopenjp2_path is None:
# No help from the config file, try to find it ourselves.
libopenjp2_path = find_library('openjp2')
if libopenjp2_path is None:
if platform.system() == 'Darwin':
path = '/opt/local/lib/libopenjp2.dylib'
if os.path.exists(path):
libopenjp2_path = path
elif os.name == 'nt':
path = os.path.join('C:\\', 'Program files', 'OpenJPEG 2.0',
'bin', 'openjp2.dll')
if os.path.exists(path):
libopenjp2_path = path
if libopenjp2_path is None:
return None
try:
if os.name == "nt":
openjp2_lib = ctypes.windll.LoadLibrary(libopenjp2_path)
else:
openjp2_lib = ctypes.CDLL(libopenjp2_path)
except (TypeError, OSError):
msg = '"Library {0}" could not be loaded. Operating in degraded mode.'
msg = msg.format(libopenjp2_path)
warnings.warn(msg, UserWarning)
openjp2_lib = None
return openjp2_lib
def glymur_config(): def glymur_config():
"""Try to ascertain locations of openjp2, openjpeg libraries. """Try to ascertain locations of openjp2, openjpeg libraries.
""" """