-
Notifications
You must be signed in to change notification settings - Fork 292
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Work around bug in opencv3 headers. #160
Conversation
6cc6a74
to
99dcb62
Compare
d781139
to
7a4c771
Compare
LGTM |
da9ded2
to
462a128
Compare
I assume we want to support OpenCV 3 then. |
@@ -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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shouldn't that be "greater or equal to" instead?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done by the way.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
approved
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.
OpenCV 3.1 doesn't define cvRound in C, only in C++. Thus, we now need
to compile av_test as C++ code.