From 41e289c7778c5d7b9dd01b16654199fb6a85f563 Mon Sep 17 00:00:00 2001
From: Tony S Yu <tsyu80@gmail.com>
Date: Thu, 21 Nov 2013 15:54:57 -0600
Subject: [PATCH] Fix hough_circle regression on windows

---
 skimage/transform/__init__.py          |  4 ++--
 skimage/transform/_hough_transform.pyx |  6 +++---
 skimage/transform/hough_transform.py   | 29 ++++++++++++++++++++++++++
 3 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/skimage/transform/__init__.py b/skimage/transform/__init__.py
index 4f00a076..30e5177a 100644
--- a/skimage/transform/__init__.py
+++ b/skimage/transform/__init__.py
@@ -1,6 +1,6 @@
-from ._hough_transform import (hough_circle, hough_ellipse, hough_line,
+from ._hough_transform import (hough_ellipse, hough_line,
                                probabilistic_hough_line)
-from .hough_transform import hough_line_peaks
+from .hough_transform import hough_circle, hough_line_peaks
 from .radon_transform import radon, iradon, iradon_sart
 from .finite_radon_transform import frt2, ifrt2
 from .integral import integral_image, integrate
diff --git a/skimage/transform/_hough_transform.pyx b/skimage/transform/_hough_transform.pyx
index 29344fa8..b7b4a411 100644
--- a/skimage/transform/_hough_transform.pyx
+++ b/skimage/transform/_hough_transform.pyx
@@ -20,9 +20,9 @@ cdef inline Py_ssize_t round(double r):
     return <Py_ssize_t>((r + 0.5) if (r > 0.0) else (r - 0.5))
 
 
-def hough_circle(cnp.ndarray img,
-                 cnp.ndarray[ndim=1, dtype=cnp.intp_t] radius,
-                 char normalize=True, char full_output=False):
+def _hough_circle(cnp.ndarray img,
+                  cnp.ndarray[ndim=1, dtype=cnp.intp_t] radius,
+                  char normalize=True, char full_output=False):
     """Perform a circular Hough transform.
 
     Parameters
diff --git a/skimage/transform/hough_transform.py b/skimage/transform/hough_transform.py
index 0a7d35a2..3168d388 100644
--- a/skimage/transform/hough_transform.py
+++ b/skimage/transform/hough_transform.py
@@ -1,6 +1,7 @@
 import numpy as np
 from scipy import ndimage
 from skimage import measure, morphology
+from ._hough_transform import _hough_circle
 
 
 def hough_line_peaks(hspace, angles, dists, min_distance=9, min_angle=10,
@@ -125,3 +126,31 @@ def hough_line_peaks(hspace, angles, dists, min_distance=9, min_angle=10,
         angle_peaks = angle_peaks[idx_maxsort]
 
     return hspace_peaks, angle_peaks, dist_peaks
+
+
+def hough_circle(image, radius, normalize=True, full_output=False):
+    """Perform a circular Hough transform.
+
+    Parameters
+    ----------
+    image : (M, N) ndarray
+        Input image with nonzero values representing edges.
+    radius : ndarray
+        Radii at which to compute the Hough transform.
+    normalize : boolean, optional (default True)
+        Normalize the accumulator with the number
+        of pixels used to draw the radius.
+    full_output : boolean, optional (default False)
+        Extend the output size by twice the largest
+        radius in order to detect centers outside the
+        input picture.
+
+    Returns
+    -------
+    H : 3D ndarray (radius index, (M + 2R, N + 2R) ndarray)
+        Hough transform accumulator for each radius.
+        R designates the larger radius if full_output is True.
+        Otherwise, R = 0.
+    """
+    return _hough_circle(image, radius.astype(np.intp),
+                         normalize=normalize, full_output=full_output)