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

Merge commit '43aec5ad^' into merge-2.4

Browse Source 
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
This commit is contained in:
Roman Donchenko
2013-08-27 13:23:26 +04:00
parent 0daac6fd9d 9c60a2c24c
commit 4d06c4c7b6
12 changed files with 67 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/core/test/test_main.cpp
View File

@@ -1,7 +1,10 @@
#ifdef HAVE_WINRT
#pragma warning(disable:4447) // Disable warning 'main' signature found without threading model
#ifdef _MSC_VER
# if _MSC_VER >= 1700
# pragma warning(disable:4447) // Disable warning 'main' signature found without threading model
# endif
#endif
#include "test_precomp.hpp"
CV_TEST_MAIN("cv")