Group shape/dtype validation logic in image_resample. #25152
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
greglucas
approved these changes
Feb 7, 2023
|
Sure, added tests. |
oscargus
reviewed
Feb 7, 2023
src/_image_wrapper.cpp
Outdated
| ¶ms.interpolation, &convert_bool, ¶ms.resample, | ||
| ¶ms.alpha, &convert_bool, ¶ms.norm, ¶ms.radius)) { | ||
| return NULL; | ||
| } | ||
|
|
||
| if (params.interpolation < 0 || params.interpolation >= _n_interpolation) { | ||
| PyErr_Format(PyExc_ValueError, "invalid interpolation value %d", | ||
| PyErr_Format(PyExc_ValueError, "INvalid interpolation value %d", |
There was a problem hiding this comment.
Suggested change
| PyErr_Format(PyExc_ValueError, "INvalid interpolation value %d", | |
| PyErr_Format(PyExc_ValueError, "Invalid interpolation value %d", |
(or was this on purpose?)
oscargus
approved these changes
Feb 7, 2023
Move it all to a single place rather than having some of it interspersed with the dtype dispatch later. Also reorder the dtype dispatch to be consistent in the 2D and 3D cases, and remove _array from many local variable names.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Move it all to a single place rather than having some of it interspersed with the dtype dispatch later.
Also reorder the dtype dispatch to be consistent in the 2D and 3D cases, and remove _array from many local variable names.
PR Summary
PR Checklist
Documentation and Tests
pytestpasses)Release Notes
.. versionadded::directive in the docstring and documented indoc/users/next_whats_new/.. versionchanged::directive in the docstring and documented indoc/api/next_api_changes/next_whats_new/README.rstornext_api_changes/README.rst