Skip to content

O
opencv
Switch branch/tag
Find file
BlameHistoryPermalink
  • Roman Donchenko's avatar
    Merge commit '43aec5ad^' into merge-2.4 · 4d06c4c7
    Roman Donchenko authored 
    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
    4d06c4c7
precomp.hpp 238 Bytes
1 2 3 4 5 6 7 8 
#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