Vladislav Vinogradov 0c7663eb3b Merge branch 'master' into gpu-cuda-rename ...

Conflicts:
	modules/core/include/opencv2/core/cuda.hpp
	modules/cudacodec/src/thread.cpp
	modules/cudacodec/src/thread.hpp
	modules/superres/perf/perf_superres.cpp
	modules/superres/src/btv_l1_cuda.cpp
	modules/superres/src/optical_flow.cpp
	modules/videostab/src/global_motion.cpp
	modules/videostab/src/inpainting.cpp
	samples/cpp/stitching_detailed.cpp
	samples/cpp/videostab.cpp
	samples/gpu/stereo_multi.cpp

2013-09-06 15:44:44 +04:00

..

test_arithm.cpp

Normalized file endings.

2013-08-21 18:59:25 +04:00

test_countnonzero.cpp

Normalize line endings and whitespace

2012-10-17 15:32:23 +04:00

test_ds.cpp

Merge branch 'master' into gpu-cuda-rename

2013-09-06 15:44:44 +04:00

test_dxt.cpp

Normalized file endings.

2013-08-21 18:59:25 +04:00

test_eigen.cpp

Cleanup core module API

2013-04-09 13:36:32 +04:00

test_io.cpp

Merge branch 'master' into gpu-cuda-rename

2013-09-06 15:44:44 +04:00

test_main.cpp

C4447 warning about main function format suppressed.

2013-08-21 07:24:46 -07:00

test_mat.cpp

Merge branch 'master' into gpu-cuda-rename

2013-09-06 15:44:44 +04:00

test_math.cpp

Merge commit '43aec5ad' into merge-2.4

2013-08-27 13:26:44 +04:00

test_misc.cpp

Added a test that documents that negative numbers are not clipped by cv::saturate_cast

2013-02-11 14:58:38 +04:00

test_operations.cpp

Changed / for Matx to Matx::div, for symmetry with Matx::mul.

2013-07-16 12:25:26 +04:00

test_precomp.hpp

Move FileStorage to separate header

2013-04-01 19:18:05 +04:00

test_ptr.cpp

Merge branch 'master' into gpu-cuda-rename

2013-09-06 15:44:44 +04:00

test_rand.cpp

Backported RNG_MT19937 from master.

2013-04-10 19:39:38 +04:00