Fix DQT + Viewer crash when minimized when running on Debug #8693
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
ev-mp
requested changes
Mar 29, 2021
common/viewer.cpp
Outdated
| @@ -24,6 +24,8 @@ | |||
| #include "../common/utilities/string/trim-newlines.h" | |||
| #include "../common/utilities/imgui/wrap.h" | |||
|
|
|||
| #define FORCE_NON_NEGATIVE(input) input < 0 ? 0 : input | |||
There was a problem hiding this comment.
Replace the macro with inline, e.g.
template<typename T>
T non_negative(const T& input)
{
return std::max(0, input)
}
common/viewer.cpp
Outdated
| @@ -1930,8 +1941,8 @@ namespace rs2 | |||
|
|
|||
| auto bottom_y = win.framebuf_height() - viewer_rect.y - viewer_rect.h; | |||
|
|
|||
| glViewport(static_cast<GLint>(viewer_rect.x), static_cast<GLint>(bottom_y), | |||
| static_cast<GLsizei>(viewer_rect.w), static_cast<GLsizei>(viewer_rect.h - top_bar_height)); | |||
| glViewport(static_cast<GLint>(FORCE_NON_NEGATIVE(viewer_rect.x)), static_cast<GLint>(FORCE_NON_NEGATIVE(bottom_y)), | |||
There was a problem hiding this comment.
the above refactor may save the explicit casts and make it more readable
There was a problem hiding this comment.
Still need the explicit cast , otherwise we get a warning
maloel
approved these changes
Mar 30, 2021
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.
When running on Debug configuration, minimizing the DQT / Viewer windows cause the application to crash.
On this PR I add protection against illegal inputs to open-gl functions
Tracked on [RS5-10796]