wassname/scikit-image
1
0
Fork 0
mirror of https://github.com/wassname/scikit-image.git synced 2026-07-21 12:50:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix logic error in _load_library

Browse Source
This commit is contained in:
Neil
2011-07-16 19:01:15 +02:00
parent fc17f50d8b
commit 12c1829b78
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scikits/image/io/_plugins/freeimage_plugin.py
+12 -13
View File
@@ -32,19 +32,18 @@ def _load_library(libname, loader_path):
libdir = os.path.dirname(loader_path)
else:
libdir = loader_path
if sys.platform == 'win32':
loader = ctypes.windll
else:
loader = ctypes.cdll
for ln in libname_ext:
try:
return loader[os.path.join(libdir, ln)]
except OSError:
pass
# TODO: Setup errno and other bits to something correctly
raise OSError(
'Unable to find library in any of the foloowing paths: %s' %
[os.path.join(libdir, ln) for ln in libname_ext])
if sys.platform == 'win32':
loader = ctypes.windll
else:
loader = ctypes.cdll
for ln in libname_ext:
try:
return loader[os.path.join(libdir, ln)]
except OSError:
pass
# TODO: Setup errno and other bits to something correctly
raise OSError('Unable to find library in any of the foloowing paths: %s' %
[os.path.join(libdir, ln) for ln in libname_ext])
lib_dirs = [os.path.dirname(__file__),