From 9329d0ad56a055d0c96d38a5ee919af1361b568f Mon Sep 17 00:00:00 2001
From: Stefan van der Walt <stefan@sun.ac.za>
Date: Sat, 12 Oct 2013 19:44:14 +0200
Subject: [PATCH] Restore @ahojnnes's overflow test.  Correctly assign out
 argument.

---
 skimage/morphology/binary.py            | 18 ++++++++++++------
 skimage/morphology/tests/test_binary.py |  9 +++++++++
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/skimage/morphology/binary.py b/skimage/morphology/binary.py
index de002c7e..5746c545 100644
--- a/skimage/morphology/binary.py
+++ b/skimage/morphology/binary.py
@@ -32,13 +32,16 @@ def binary_erosion(image, selem, out=None):
     selem = (selem != 0)
     selem_sum = np.sum(selem)
 
-    if selem_sum > 255:
+    if selem_sum <= 255:
         binary = (image != 0).view(np.uint8)
     else:
         binary = (image != 0).astype(np.intp)
 
-    out = ndimage.convolve(binary, selem, mode='constant', cval=1)
-    return np.equal(out, selem_sum, out=out)
+    conv = ndimage.convolve(binary, selem, mode='constant', cval=1)
+
+    if out is None:
+        out = np.zeros_like(binary, dtype=bool)
+    return np.equal(conv, selem_sum, out=out)
 
 
 def binary_dilation(image, selem, out=None):
@@ -69,13 +72,16 @@ def binary_dilation(image, selem, out=None):
 
     """
     selem = (selem != 0)
-    if np.sum(selem) > 255:
+    if np.sum(selem) <= 255:
         binary = (image != 0).view(np.uint8)
     else:
         binary = (image != 0).astype(np.intp)
 
-    out = ndimage.convolve(binary, selem, mode='constant', cval=0)
-    return np.not_equal(out, 0, out=out)
+    conv = ndimage.convolve(binary, selem, mode='constant', cval=0)
+
+    if out is None:
+        out = np.zeros_like(binary, dtype=bool)
+    return np.not_equal(conv, 0, out=out)
 
 
 def binary_opening(image, selem, out=None):
diff --git a/skimage/morphology/tests/test_binary.py b/skimage/morphology/tests/test_binary.py
index 2f47c917..dcddc066 100644
--- a/skimage/morphology/tests/test_binary.py
+++ b/skimage/morphology/tests/test_binary.py
@@ -45,5 +45,14 @@ def test_binary_opening():
     testing.assert_array_equal(binary_res, grey_res)
 
 
+def test_selem_overflow():
+    strel = np.ones((17, 17), dtype=np.uint8)
+    img = np.zeros((20, 20))
+    img[2:19, 2:19] = 1
+    binary_res = binary.binary_erosion(img, strel)
+    grey_res = img_as_bool(grey.erosion(img, strel))
+    testing.assert_array_equal(binary_res, grey_res)
+
+
 if __name__ == '__main__':
     testing.run_module_suite()