wassname/scikit-image
1
0
Fork 0
mirror of https://github.com/wassname/scikit-image.git synced 2026-07-19 11:27:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use in-place operation for clipping

Browse Source
This commit is contained in:
Johannes Schönberger
2014-12-23 13:51:25 +01:00
parent 451d8aa697
commit 0d2c5def06
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skimage/transform/_geometric.py
+8 -6
View File
@@ -1012,14 +1012,16 @@ def _clip_warp_output(input_image, output_image, clip, mode, order, cval):
min_val = input_image.min()
max_val = input_image.max()
clipped = np.clip(output_image, min_val, max_val)
preserve_cval = mode == 'constant' and not \
(min_val <= cval <= max_val)
if mode == 'constant' and not (min_val <= cval <= max_val):
clipped[output_image == cval] = cval
if preserve_cval:
cval_mask = output_image == cval
return clipped
np.clip(output_image, min_val, max_val, out=output_image)
return output_image
if preserve_cval:
output_image[cval_mask] = cval
def warp(image, inverse_map=None, map_args={}, output_shape=None, order=1,
@@ -1252,6 +1254,6 @@ def warp(image, inverse_map=None, map_args={}, output_shape=None, order=1,
mode=mode, order=order, cval=cval)
out = _clip_warp_output(image, out, clip, mode, order, cval)
_clip_warp_output(image, out, clip, mode, order, cval)
return out
skimage/transform/_warps.py
+1 -1
View File
@@ -84,7 +84,7 @@ def resize(image, output_shape, order=1, mode='constant', cval=0, clip=True,
out = ndimage.map_coordinates(image, coord_map, order=order,
mode=mode, cval=cval)
out = _clip_warp_output(image, out, clip, mode, order, cval)
_clip_warp_output(image, out, clip, mode, order, cval)
else: # 2-dimensional interpolation