From 375e406f646bc5aa1a78322098a1ffe1217aa18d Mon Sep 17 00:00:00 2001
From: "Josh Warner (Mac)" <warner.joshua@mayo.edu>
Date: Thu, 8 May 2014 19:56:47 -0500
Subject: [PATCH] Use safe_as_int for input checking.

---
 skimage/feature/corner.py       | 3 ++-
 skimage/transform/_geometric.py | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/skimage/feature/corner.py b/skimage/feature/corner.py
index a9b84ec0..6e06b779 100644
--- a/skimage/feature/corner.py
+++ b/skimage/feature/corner.py
@@ -8,6 +8,7 @@ from skimage.feature.util import _prepare_grayscale_input_2D
 from skimage.feature.corner_cy import _corner_fast
 from ._hessian_det_appx import _hessian_matrix_det
 from ..transform import integral_image
+from .._shared.utils import safe_as_int
 
 
 def _compute_derivatives(image, mode='constant', cval=0):
@@ -675,7 +676,7 @@ def corner_subpix(image, corners, window_size=11, alpha=0.99):
     image = pad(image, pad_width=wext, mode='constant', constant_values=0)
 
     # add pad width, make sure to not modify the input values in-place
-    corners = corners + wext
+    corners = safe_as_int(corners + wext)
 
     # normal equation arrays
     N_dot = np.zeros((2, 2), dtype=np.double)
diff --git a/skimage/transform/_geometric.py b/skimage/transform/_geometric.py
index ca813600..59ca4731 100644
--- a/skimage/transform/_geometric.py
+++ b/skimage/transform/_geometric.py
@@ -7,6 +7,7 @@ from scipy import ndimage, spatial
 from skimage._shared.utils import get_bound_method_class
 from skimage.util import img_as_float
 from ._warps_cy import _warp_fast
+from .._shared.utils import safe_as_int
 
 
 class GeometricTransform(object):
@@ -722,6 +723,7 @@ class PolynomialTransform(GeometricTransform):
         rows = src.shape[0]
 
         # number of unknown polynomial coefficients
+        order = safe_as_int(order)
         u = (order + 1) * (order + 2)
 
         A = np.zeros((rows * 2, u + 1))
@@ -958,6 +960,7 @@ def warp_coords(coord_map, shape, dtype=np.float64):
     >>> warped_image = map_coordinates(image, coords)
 
     """
+    shape = safe_as_int(shape)
     rows, cols = shape[0], shape[1]
     coords_shape = [len(shape), rows, cols]
     if len(shape) == 3: