Move harris corner detection from filter to feature subpackage.

doc/examples/plot_harris.py

@@ -13,7 +13,7 @@ detection in multiple directions.
 from matplotlib import pyplot as plt
 
 from skimage import data, img_as_float
-from skimage.filter import harris
+from skimage.feature import harris
 
 
 def plot_harris_points(image, filtered_coords):

skimage/feature/__init__.py

@@ -1,3 +1,4 @@
 from hog import hog
 from greycomatrix import greycomatrix, greycoprops
 from peak import peak_local_max
+from harris import harris

skimage/feature/harris.py

@@ -6,7 +6,7 @@ http://www.janeriksolem.net/2009/01/harris-corner-detector-in-python.html
 """
 from scipy import ndimage
 
-from skimage import feature
+from . import peak
 
 
 def _compute_harris_response(image, eps=1e-6, gaussian_deviation=1):
@@ -79,7 +79,7 @@ def harris(image, min_distance=10, threshold=0.1, eps=1e-6,
     """
     harrisim = _compute_harris_response(image, eps=eps,
                     gaussian_deviation=gaussian_deviation)
-    coordinates = feature.peak_local_max(harrisim, min_distance=min_distance,
+    coordinates = peak.peak_local_max(harrisim, min_distance=min_distance,
                                         threshold=threshold)
     return coordinates
 

skimage/feature/tests/test_harris.py

@@ -3,7 +3,7 @@ import numpy as np
 from skimage import data
 from skimage import img_as_float
 
-from skimage.filter import harris
+from skimage.feature import harris
 
 
 def test_square_image():

skimage/filter/__init__.py

@@ -5,4 +5,3 @@ from edges import sobel, hsobel, vsobel, hprewitt, vprewitt, prewitt
 from tv_denoise import tv_denoise
 from rank_order import rank_order
 from thresholding import threshold_otsu
-from harris import harris