From 49c03eb448567f613f19b59e705c70505160f830 Mon Sep 17 00:00:00 2001
From: Stefan van der Walt <stefan@sun.ac.za>
Date: Fri, 14 May 2010 13:52:41 +0200
Subject: [PATCH] Try to load both libfreeimage and libFreeImage.

---
 scikits/image/io/_plugins/freeimage_plugin.py | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/scikits/image/io/_plugins/freeimage_plugin.py b/scikits/image/io/_plugins/freeimage_plugin.py
index 34f25959..bc5ca18e 100644
--- a/scikits/image/io/_plugins/freeimage_plugin.py
+++ b/scikits/image/io/_plugins/freeimage_plugin.py
@@ -3,7 +3,7 @@ import numpy
 import sys
 import os
 
-lib_dirs = ('.',
+lib_dirs = (os.path.dirname(__file__),
             '/lib',
             '/usr/lib',
             '/usr/local/lib',
@@ -36,10 +36,16 @@ def register_api(lib,api):
 
 _FI = None
 for d in lib_dirs:
-    try:
-        _FI = numpy.ctypeslib.load_library('libFreeImage', d)
-    except OSError:
-        pass
+    for libname in ('libfreeimage', 'libFreeImage'):
+        try:
+            _FI = numpy.ctypeslib.load_library(libname, d)
+        except OSError:
+            pass
+        else:
+            break
+
+    if _FI is not None:
+        break
 
 if not _FI:
     raise OSError('Could not find libFreeImage in any of the following '