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

Merge branch 'issue138'

Browse source
This commit is contained in:
John Evans 2013-10-29 09:30:02 -04:00
commit fca8bac347
4 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
CHANGES.txt
View file

@ -1,3 +1,6 @@
Oct 29, 2013 - v0.5.8 Fixed unnecessary warnings when default locations for
openjpeg libraries on mac do not specify the actual library.
Oct 28, 2013 - v0.5.7 Fixed bad import error message when libopenjpeg library Oct 28, 2013 - v0.5.7 Fixed bad import error message when libopenjpeg library
not installed on mac. not installed on mac.

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.5' version = '0.5'
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
release = '0.5.7' release = '0.5.8'
# 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.

10
glymur/lib/config.py
View file

@ -45,6 +45,12 @@ def glymurrc_fname():
def load_openjpeg(path): def load_openjpeg(path):
"""Load the openjpeg library, falling back on defaults if necessary. """Load the openjpeg library, falling back on defaults if necessary.
Parameters
----------
path : str
Path to openjpeg 1.5 library as specified by configuration file. Will
be None if no configuration file specified.
""" """
if path is None: if path is None:
# Let ctypes try to find it. # Let ctypes try to find it.
@ -84,7 +90,9 @@ def load_openjp2(path):
def load_library_handle(path): def load_library_handle(path):
"""Load the library, return the ctypes handle.""" """Load the library, return the ctypes handle."""
if path is None: if path is None or (path is not None and not os.path.exists(path)):
# Either could not find a library via ctypes or user-configuration-file,
# or we could not find it in any of the default locations.
return None return None
try: try:

2
glymur/version.py
View file

@ -15,7 +15,7 @@ from .lib import openjp2 as opj2
# Do not change the format of this next line! Doing so risks breaking # Do not change the format of this next line! Doing so risks breaking
# setup.py # setup.py
version = "0.5.7" version = "0.5.8"
_sv = LooseVersion(version) _sv = LooseVersion(version)
version_tuple = _sv.version version_tuple = _sv.version