Add a test that exposed the infinite loop

scikit-image · Oct 25, 2015 · 7bea0c1 · 7bea0c1
1 parent 8317bcf
commit 7bea0c1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/skimage/exposure/_adapthist.py b/skimage/exposure/_adapthist.py
@@ -245,7 +245,7 @@ def clip_histogram(hist, clip_limit):
     hist[mid_mask] = clip_limit
 
     iteration = 0
-    while n_excess > 0 and iteration < 256:  # Redistribute remaining excess
+    while n_excess > 0 and iteration < 20:  # Redistribute remaining excess
         index = 0
         while n_excess > 0 and index < hist.size:
             under_mask = hist < 0

diff --git a/skimage/exposure/tests/test_exposure.py b/skimage/exposure/tests/test_exposure.py
@@ -213,7 +213,7 @@ def test_adapthist_grayscale():
     img = np.dstack((img, img, img))
     with expected_warnings(['precision loss|non-contiguous input', 
                             'deprecated']):
-        adapted_old = exposure.equalize_adapthist(img, 10, 9, clip_limit=0.01,
+        adapted_old = exposure.equalize_adapthist(img, 10, 9, clip_limit=0.001,
                                                   nbins=128)
         adapted = exposure.equalize_adapthist(img, kernel_size=(57, 51), clip_limit=0.01, nbins=128)
     assert img.shape == adapted.shape