fix: setViewport can cause a crash if voi or scale are not provided #493
Conversation
This file contains 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
mikehazell
changed the title
mikehazell
changed the title
mikehazell
commented
Oct 30, 2020
| @@ -35,12 +35,12 @@ export default function (element, viewport) { | |||
| // Prevent window width from being too small (note that values close to zero are valid and can occur with | |||
| // PET images in particular) | |||
| if (enabledElement.viewport.voi.windowWidth) { | |||
| enabledElement.viewport.voi.windowWidth = Math.max(viewport.voi.windowWidth, MIN_WINDOW_WIDTH); | |||
| enabledElement.viewport.voi.windowWidth = Math.max(enabledElement.viewport.voi.windowWidth, MIN_WINDOW_WIDTH); | |||
There was a problem hiding this comment.
viewport.voi.windowWidth and enabledElement.viewport.voi.windowWidth should be equal given the merge on lines 26-32.
mikehazell
commented
Oct 30, 2020
| } | ||
|
|
||
| // Prevent scale from getting too small | ||
| if (enabledElement.viewport.scale) { | ||
| enabledElement.viewport.scale = Math.max(viewport.scale, MIN_VIEWPORT_SCALE); | ||
| enabledElement.viewport.scale = Math.max(enabledElement.viewport.scale, MIN_VIEWPORT_SCALE); |
There was a problem hiding this comment.
Same goes for viewport.scale and enabledElement.viewport.scale.
mikehazell
commented
Oct 30, 2020
|
🎉 This PR is included in version 2.4.0 🎉 The release is available on: Your semantic-release bot 📦🚀 |
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.
This PR fixes an issue where
setViewportcan cause a crash if not providedvoiorscale.