wassname/scikit-image
1
0
Fork 0
mirror of https://github.com/wassname/scikit-image.git synced 2026-09-10 12:35:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1005 from JDWarner/int_idx_patch

Browse Source 
Fix NumPy non-integer indexing deprecation warnings
This commit is contained in:
Stefan van der Walt
2014-05-13 17:48:11 +02:00
parent aff717f8de 8663e23f4a
commit 5b07567973
8 changed files with 86 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skimage/transform/_geometric.py
+4 -2
View File
@@ -722,6 +722,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))
@@ -729,7 +730,7 @@ class PolynomialTransform(GeometricTransform):
for j in range(order + 1):
for i in range(j + 1):
A[:rows, pidx] = xs ** (j - i) * ys ** i
A[rows:, pidx + u / 2] = xs ** (j - i) * ys ** i
A[rows:, pidx + u // 2] = xs ** (j - i) * ys ** i
pidx += 1
A[:rows, -1] = xd
@@ -741,7 +742,7 @@ class PolynomialTransform(GeometricTransform):
# singular value
params = - V[-1, :-1] / V[-1, -1]
self.params = params.reshape((2, u / 2))
self.params = params.reshape((2, u // 2))
def __call__(self, coords):
"""Apply forward transformation.
@@ -958,6 +959,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: