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

Replaced the semi-public CV_PARALLEL_FRAMEWORK macro with a function.

Browse Source 
That way, core/internal.hpp doesn't have to depend on cvconfig.h, which we
don't ship.
This commit is contained in:
Roman Donchenko
2013-06-21 12:43:16 +04:00
parent 1d9660c6d2
commit c16316c4b4
4 changed files with 42 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modules/ts/src/ts_func.cpp
View File

@@ -2963,13 +2963,12 @@ void printVersionInfo(bool useStdOut)
if(useStdOut) std::cout << ver << std::endl;
}
#ifdef CV_PARALLEL_FRAMEWORK
::testing::Test::RecordProperty("cv_parallel_framework", CV_PARALLEL_FRAMEWORK);
if (useStdOut)
{
std::cout << "Parallel framework: " << CV_PARALLEL_FRAMEWORK << std::endl;
const char* parallel_framework = currentParallelFramework();
if (parallel_framework) {
::testing::Test::RecordProperty("cv_parallel_framework", parallel_framework);
if (useStdOut) std::cout << "Parallel framework: " << parallel_framework << std::endl;
}
#endif
std::string cpu_features;