Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix-up some errors #140

Merged
merged 4 commits into from
Oct 16, 2018
Merged

Fix-up some errors #140

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
899d999
Convert bad `axis` argument to `ValueError`
jakirkham Oct 16, 2018
e6adb00
Convert window size assertion to `ValueError`
jakirkham Oct 16, 2018
255a7ba
Convert rank assertion to `ValueError`
jakirkham Oct 16, 2018
e44e8b1
Fix copy `out_swap` to `out` error message
jakirkham Oct 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/rank_filter.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@ def lineRankOrderFilter(numpy.ndarray image not None,
if -image.ndim <= axis < 0:
axis += image.ndim
elif not (0 <= axis < image.ndim):
raise IndexError("`axis` needs to be within `image.ndim`")
raise ValueError("`axis` needs to be within `image.ndim`")

assert ((half_length + 1) <= image.shape[axis]), \
"Window must be no bigger than the image."
if not ((half_length + 1) <= image.shape[axis]):
raise ValueError("Window must be no bigger than the image.")

assert (0.0 <= rank <= 1.0), \
"The rank must be between 0.0 and 1.0."
if not (0.0 <= rank <= 1.0):
raise ValueError("The rank must be between 0.0 and 1.0.")

if out is None:
out = numpy.PyArray_NewCopy(image, numpy.NPY_CORDER)
Expand Down Expand Up @@ -100,6 +100,6 @@ def lineRankOrderFilter(numpy.ndarray image not None,

out_swap = numpy.PyArray_SwapAxes(out_swap, out.ndim - 1, axis)
if numpy.PyArray_CopyInto(out, out_swap) == -1:
raise RuntimeError("Unable to copy `out` to `out_swap`.")
raise RuntimeError("Unable to copy `out_swap` to `out`.")

return(out)