RLS Version 1.4.9

BUG Fix FreeImage detection close #108
luispedro · Nov 12, 2019 · 0c3cc25 · 0c3cc25
1 parent 044023e
commit 0c3cc25
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,6 @@
+Version 1.4.9 2019-11-12 by luispedro
+	* Fix FreeImage detection (issue #108)
+
 Version 1.4.8 2019-10-11 by luispedro
 	* Fix co-occurrence matrix computation (patch by @databaaz)
 

diff --git a/README.md b/README.md
@@ -220,6 +220,10 @@ questions.
 
 ## Recent Changes
 
+### Version 1.4.9 (Nov 12 2019)
+
+- Fix FreeImage detection (issue #108)
+
 ### Version 1.4.8 (Oct 11 2019)
 
 - Fix co-occurrence matrix computation (patch by @databaaz)

diff --git a/docs/source/history.rst b/docs/source/history.rst
@@ -2,6 +2,12 @@
 History
 =======
 
+Version 1.4.9 (Nov 12 2019)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+- Fix FreeImage detection (issue #108)
+
+
 Version 1.4.8 (Oct 11 2019)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

diff --git a/mahotas/io/__init__.py b/mahotas/io/__init__.py
@@ -62,7 +62,8 @@ def error_imsave(*args, **kwargs):
             from .pil import imread, imsave
         except ImportError:
             from .freeimage import imread, imsave
-except ImportError: # pragma: no cover
+# Importing freeimage can throw both ImportError and OSError, so check for both
+except (OSError, ImportError): # pragma: no cover
     import sys
     _,e,_ = sys.exc_info()
     _error_message %= e

diff --git a/mahotas/mahotas_version.py b/mahotas/mahotas_version.py
@@ -1 +1 @@
-__version__ = '1.4.8'
+__version__ = '1.4.9'