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

Conflicts:
	modules/contrib/src/retina.cpp
	modules/gpu/perf/perf_video.cpp
	modules/gpuoptflow/src/tvl1flow.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_calib3d.cpp
	modules/ocl/perf/perf_color.cpp
	modules/ocl/perf/perf_match_template.cpp
	modules/ocl/src/precomp.hpp
	samples/gpu/stereo_multi.cpp

2013-09-02 19:44:51 +04:00

..

perf_abs.cpp

Normalized file endings.

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

perf_addWeighted.cpp

Increased time limits, eliminated extra params

2013-01-31 16:18:52 +04:00

perf_arithm.cpp

Increased time limits, eliminated extra params

2013-01-31 16:18:52 +04:00

perf_bitwise.cpp

Normalized file endings.

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

perf_compare.cpp

Eliminate the need of ::testsing::ValuesIn() for CV_ENUM

2013-04-15 19:39:49 +04:00

perf_convertTo.cpp

Switched to TEST_CYCLE_MULTIRUN for fast tests

2013-02-20 17:05:54 +04:00

perf_dft.cpp

Normalize line endings and whitespace

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

perf_dot.cpp

increased time-limits

2012-11-28 18:17:33 +04:00

perf_inRange.cpp

Normalize line endings and whitespace

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

perf_main.cpp

C4447 warning about main function format suppressed.

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

perf_mat.cpp

Switched to TEST_CYCLE_MULTIRUN for fast tests

2013-02-20 17:05:54 +04:00

perf_math.cpp

added perf test for kmeans

2012-10-10 12:51:11 +04:00

perf_merge.cpp

Normalized file endings.

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

perf_minmaxloc.cpp

Refactored performance tests. TEST_CYCLE macro is renamed to TEST_CYCLE_N; SIMPLE_TEST_CYCLE is renamed to TEST_CYCLE; from now 100 iterations are default for performance tests

2011-12-29 16:46:16 +00:00

perf_norm.cpp

Increased time limits, eliminated extra params

2013-01-31 16:18:52 +04:00

perf_precomp.hpp

Main module headers are moved 1 level up

2013-03-13 17:26:56 +04:00

perf_reduce.cpp

add multiruns to fix "unreliable results" error

2013-06-13 21:14:42 +04:00

perf_split.cpp

Switched to TEST_CYCLE_MULTIRUN for fast tests

2013-02-20 17:05:54 +04:00

perf_stat.cpp

Add IPP support in meanStdDev, minMaxIdx, norm functions

2013-08-29 21:09:19 +04:00