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

Conflicts:
	modules/contrib/src/basicretinafilter.hpp
	modules/contrib/src/magnoretinafilter.hpp
	modules/contrib/src/parvoretinafilter.hpp
	modules/contrib/src/retinacolor.hpp
	modules/gpu/include/opencv2/gpu/gpu.hpp
	modules/highgui/src/cap_tyzx.cpp
	modules/ocl/perf/perf_filters.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/opencl/haarobjectdetect.cl
	modules/ocl/test/test_filters.cpp
	modules/ocl/test/test_objdetect.cpp

2014-03-03 13:45:22 +04:00

..

ocl

added perf test

2014-02-05 20:24:30 +04:00

test_arithm.cpp

fixed defects from coverity.com

2014-02-23 20:21:08 +04:00

test_countnonzero.cpp

Normalize line endings and whitespace

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

test_ds.cpp

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

2014-03-03 13:45:22 +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

added randomized test

2014-02-21 12:47:01 +05:30

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

fixed defects from coverity.com

2014-02-23 20:21:08 +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

cleaned-up UMat tests

2014-02-15 15:51:52 +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_rotatedrect.cpp

addressed issues

2014-02-22 09:54:16 +05:30

test_umat.cpp

disabled 'reshape', 'copyTo' test

2014-02-15 20:17:42 +04:00