Roman Donchenko 2bbda9d225 Merge remote-tracking branch 'origin/2.4' into merge-2.4 ...

Conflicts:
	modules/cudaimgproc/test/test_color.cpp
	modules/dynamicuda/include/opencv2/dynamicuda/dynamicuda.hpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/gpu/src/imgproc.cpp
	modules/gpu/test/test_core.cpp
	modules/gpu/test/test_imgproc.cpp
	modules/java/generator/src/cpp/VideoCapture.cpp
	samples/gpu/performance/CMakeLists.txt
	samples/tapi/CMakeLists.txt

2014-02-03 13:23:59 +04:00

..

ocl

fixed cv::split; enabled test

2014-01-27 12:00:53 +04:00

test_arithm.cpp

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2014-01-14 11:53:59 +04:00

test_countnonzero.cpp

Normalize line endings and whitespace

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

test_ds.cpp

Boring changes - core.

2013-09-05 18:26:43 +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

deleted excess semicolons, commas

2014-01-18 01:31:33 +04:00

test_main.cpp

C4447 warning about main function format suppressed.

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

test_mat.cpp

Merge pull request #2176 from SpecLad:merge-2.4

2014-01-20 18:04:56 +04:00

test_math.cpp

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2014-02-03 13:23:59 +04:00

test_misc.cpp

added new perf tests to core

2013-12-27 20:02:12 +04:00

test_operations.cpp

deleted excess semicolons, commas

2014-01-18 01:31:33 +04:00

test_precomp.hpp

Move FileStorage to separate header

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

test_ptr.cpp

Added tests for Ptr.

2013-09-05 19:03:00 +04:00

test_rand.cpp

Backported RNG_MT19937 from master.

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

test_umat.cpp

deleted excess semicolons, commas

2014-01-18 01:31:33 +04:00