generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix gpu::DeviceInfo compilation under linux

Browse Source 
glibc defines major and minor macros
which conflict with  gpu::DeviceInfo methods with the same name
This commit is contained in:
Vladislav Vinogradov
2013-06-21 13:53:56 +04:00
parent eff6dccb3b
commit 98bd401534
12 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/gpuoptflow/test/test_optflow.cpp
View File

@@ -80,7 +80,7 @@ GPU_TEST_P(BroxOpticalFlow, Regression)
brox(loadMat(frame0), loadMat(frame1), u, v);
std::string fname(cvtest::TS::ptr()->get_data_path());
if (devInfo.major() >= 2)
if (devInfo.majorVersion() >= 2)
fname += "opticalflow/brox_optical_flow_cc20.bin";
else
fname += "opticalflow/brox_optical_flow.bin";