Minor changes to the quality module to support Visual Studio 2013 #2046
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
alalek
reviewed
Mar 19, 2019
| @@ -16,7 +16,7 @@ namespace quality_utils | |||
| { | |||
|
|
|||
| // default type of matrix to expand to | |||
| static CV_CONSTEXPR const int EXPANDED_MAT_DEFAULT_TYPE = CV_32F; | |||
| static CV_CONSTEXPR int EXPANDED_MAT_DEFAULT_TYPE = CV_32F; | |||
There was a problem hiding this comment.
Please split this by #ifdef too:
#if __cplusplus >= 201103L || (defined(_MSC_VER) && _MSC_VER >= 1900/*MSVS 2015*/)
static constexpr const int EXPANDED_MAT_DEFAULT_TYPE = CV_32F;
#else
// support MSVS 2013
static const int EXPANDED_MAT_DEFAULT_TYPE = CV_32F;
#endif
or leave this line unchanged with this patch from main repository: opencv/opencv#14101
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 pull request makes minor changes to the quality module to support Visual Studio 2013.