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

Trying to get svn version running on python(xy). No luck.

Browse source 
But the code is sort of in place.
This commit is contained in:
John G Evans 2013-07-05 13:21:13 -04:00
commit 36ea74a27e
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
glymur/lib/openjp2.py
View file

@ -80,7 +80,10 @@ def _get_openjp2_config():
return None return None
try: try:
_OPENJP2 = ctypes.CDLL(libopenjp2_path) if os.name == "nt":
_OPENJP2 = ctypes.windll.LoadLibrary(libopenjp2_path)
else:
_OPENJP2 = ctypes.CDLL(libopenjp2_path)
except OSError: except OSError:
msg = '"Library {0}" could not be loaded. Operating in degraded mode.' msg = '"Library {0}" could not be loaded. Operating in degraded mode.'
msg = msg.format(libopenjp2_path) msg = msg.format(libopenjp2_path)
@ -109,6 +112,9 @@ def _get_configdir():
if 'HOME' in os.environ: if 'HOME' in os.environ:
return os.path.join(os.environ['HOME'], '.config', 'glymur') return os.path.join(os.environ['HOME'], '.config', 'glymur')
if 'USERPROFILE' in os.environ:
return os.path.join(os.environ['USERPROFILE'], 'Application Data', 'glymur')
import os import os
import warnings import warnings
@ -656,8 +662,8 @@ class _codestream_info_v2_t(ctypes.Structure):
# Restrict the input and output argument types for each function used in the # Restrict the input and output argument types for each function used in the
# API. # API.
if _OPENJP2 is not None: if _OPENJP2 is not None:
_OPENJP2.opj_create_compress.argtypes = [_codec_format_t]
_OPENJP2.opj_create_compress.restype = _codec_t_p _OPENJP2.opj_create_compress.restype = _codec_t_p
_OPENJP2.opj_create_compress.argtypes = [_codec_format_t]
_OPENJP2.opj_create_decompress.argtypes = [_codec_format_t] _OPENJP2.opj_create_decompress.argtypes = [_codec_format_t]
_OPENJP2.opj_create_decompress.restype = _codec_t_p _OPENJP2.opj_create_decompress.restype = _codec_t_p