mirror of
https://github.com/opencv/opencv.git
synced 2024-11-24 19:20:28 +08:00
Merge pull request #1244 from vkocheganov:bugfix_3179
This commit is contained in:
commit
167abf0dae
@ -475,9 +475,16 @@ CV_EXPORTS void PrintTo(const Size& sz, ::std::ostream* os);
|
|||||||
INSTANTIATE_TEST_CASE_P(/*none*/, fixture##_##name, params);\
|
INSTANTIATE_TEST_CASE_P(/*none*/, fixture##_##name, params);\
|
||||||
void fixture##_##name::PerfTestBody()
|
void fixture##_##name::PerfTestBody()
|
||||||
|
|
||||||
|
#if defined(_MSC_VER) && (_MSC_VER <= 1400)
|
||||||
|
#define CV_PERF_TEST_MAIN_INTERNALS_ARGS(...) \
|
||||||
|
while (++argc >= (--argc,-1)) {__VA_ARGS__; break;} /*this ugly construction is needed for VS 2005*/
|
||||||
|
#else
|
||||||
|
#define CV_PERF_TEST_MAIN_INTERNALS_ARGS(...) \
|
||||||
|
__VA_ARGS__;
|
||||||
|
#endif
|
||||||
|
|
||||||
#define CV_PERF_TEST_MAIN_INTERNALS(modulename, impls, ...) \
|
#define CV_PERF_TEST_MAIN_INTERNALS(modulename, impls, ...) \
|
||||||
while (++argc >= (--argc,-1)) {__VA_ARGS__; break;} /*this ugly construction is needed for VS 2005*/\
|
CV_PERF_TEST_MAIN_INTERNALS_ARGS(__VA_ARGS__) \
|
||||||
::perf::Regression::Init(#modulename);\
|
::perf::Regression::Init(#modulename);\
|
||||||
::perf::TestBase::Init(std::vector<std::string>(impls, impls + sizeof impls / sizeof *impls),\
|
::perf::TestBase::Init(std::vector<std::string>(impls, impls + sizeof impls / sizeof *impls),\
|
||||||
argc, argv);\
|
argc, argv);\
|
||||||
|
Loading…
Reference in New Issue
Block a user