Merge branch 'docstring' of github.com:sciunto/scikit-image

This commit is contained in:
François Boulogne
2013-03-20 08:37:54 +01:00
4 changed files with 8 additions and 5 deletions
+3
View File
@@ -100,6 +100,9 @@ from skimage._shared.utils import deprecated
@deprecated('hough_line')
def hough(img, theta=None):
"""
This function is deprecated. Use `hough_line` instead.
"""
return hough_line(img, theta)
from ._hough_transform import _hough_circle