4d06c4c7b6
Conflicts: modules/contrib/src/inputoutput.cpp modules/gpu/perf/perf_imgproc.cpp modules/gpuarithm/perf/perf_element_operations.cpp modules/gpuarithm/src/element_operations.cpp modules/ts/src/precomp.hpp
9 lines
238 B
C++
9 lines
238 B
C++
#include "opencv2/core/utility.hpp"
|
|
#include "opencv2/core/private.hpp"
|
|
#include "opencv2/ts.hpp"
|
|
#include "cvconfig.h"
|
|
|
|
#ifdef GTEST_LINKED_AS_SHARED_LIBRARY
|
|
#error ts module should not have GTEST_LINKED_AS_SHARED_LIBRARY defined
|
|
#endif
|