From 71631bfca486ddce5320c2f029640969b493788b Mon Sep 17 00:00:00 2001 From: Stefan van der Walt Date: Tue, 15 Mar 2011 01:23:51 +0200 Subject: [PATCH] ENH: Also scan /home/stefan/lib for freeimage.so. --- scikits/image/io/_plugins/freeimage_plugin.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/scikits/image/io/_plugins/freeimage_plugin.py b/scikits/image/io/_plugins/freeimage_plugin.py index b0cc1261..d165a855 100644 --- a/scikits/image/io/_plugins/freeimage_plugin.py +++ b/scikits/image/io/_plugins/freeimage_plugin.py @@ -5,12 +5,15 @@ import os from numpy.compat import asbytes -lib_dirs = (os.path.dirname(__file__), +lib_dirs = [os.path.dirname(__file__), '/lib', '/usr/lib', '/usr/local/lib', '/opt/local/lib', - ) + ] + +if 'HOME' in os.environ: + lib_dirs.append(os.path.join(os.environ['HOME'], 'lib')) API = { 'FreeImage_Load': (ctypes.c_voidp, @@ -38,7 +41,8 @@ def register_api(lib,api): _FI = None for d in lib_dirs: - for libname in ('FreeImage.dll', 'libfreeimage', 'libFreeImage'): + for libname in ('freeimage', 'FreeImage', + 'libfreeimage', 'libFreeImage'): try: _FI = numpy.ctypeslib.load_library(libname, d) except OSError: