From e42cb6fadf5f472dff7717981e1619de01f0add3 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Mon, 15 Jun 2015 21:37:01 -0500 Subject: [PATCH] Update docstring Style fixes Update equalize_adapthist to use new view_as_windows Update equalize_adapthist to use new view_as_windows Try rbase again Update equalize_adapthist to use new view_as_windows Fix relative imports Style fixes Add a deprecation warning and add to api_changes.txt Update TODO and switch to 0.13 deprecation Preserve the current API as much as possible and defer to 0.14 Move the new kwarg to the very end Clarify deprecation warning Update to use row/col in clahe Update docstring Use optimal_step to set up view_as_windows Update equalize_adapthist to use new view_as_windows Try rbase again Update equalize_adapthist to use new view_as_windows Fix relative imports Style fixes Add a deprecation warning and add to api_changes.txt --- skimage/exposure/_adapthist.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/skimage/exposure/_adapthist.py b/skimage/exposure/_adapthist.py index 094dd4b8..85120b35 100644 --- a/skimage/exposure/_adapthist.py +++ b/skimage/exposure/_adapthist.py @@ -21,9 +21,13 @@ from ..color.adapt_rgb import adapt_rgb, hsv_value from ..exposure import rescale_intensity from ..util import view_as_windows <<<<<<< HEAD +<<<<<<< HEAD from .._shared.utils import skimage_deprecation, warnings ======= >>>>>>> 3bcbbc0... Update equalize_adapthist to use new view_as_windows +======= +from .._shared.utils import skimage_deprecation +>>>>>>> 446f383... Add a deprecation warning and add to api_changes.txt NR_OF_GREY = 2 ** 14 # number of grayscale levels to use in CLAHE algorithm