Work around bug in opencv3 headers. #160
Merged
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
iphydf
force-pushed
the
opencv3
branch
2 times, most recently
from
6cc6a74
to
99dcb62
Compare
iphydf
force-pushed
the
opencv3
branch
2 times, most recently
from
d781139
to
7a4c771
Compare
|
LGTM |
iphydf
force-pushed
the
opencv3
branch
2 times, most recently
from
da9ded2
to
462a128
Compare
|
I assume we want to support OpenCV 3 then. |
nurupo
reviewed
Sep 24, 2016
| @@ -288,6 +288,11 @@ if(NOT WIN32 AND BUILD_TOXAV AND SNDFILE_FOUND AND PORTAUDIO_FOUND AND OPENCV_FO | |||
| ${OPENCV_LIBRARIES} | |||
| ${PORTAUDIO_LIBRARIES} | |||
| ${SNDFILE_LIBRARIES}) | |||
| # Due to https://github.com/opencv/opencv/issues/6585, we need to compile | |||
| # av_test as C++ for newer OpenCV versions. | |||
| if(OPENCV_VERSION VERSION_GREATER 3) | |||
There was a problem hiding this comment.
Shouldn't that be "greater or equal to" instead?
There was a problem hiding this comment.
I think 3.1 is greater than 3. I don't know whether 3 works, but we got the bug report for 3.1. I'll make it "not less than", which is greater equal.
iphydf
force-pushed
the
opencv3
branch
2 times, most recently
from
9e3c5ba
to
f9ec37d
Compare
OpenCV 3.1 doesn't define cvRound in C, only in C++. Thus, we now need to compile av_test as C++ code.
nurupo
approved these changes
Sep 25, 2016
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.
OpenCV 3.1 doesn't define cvRound in C, only in C++. Thus, we now need
to compile av_test as C++ code.