Roman Donchenko 4d06c4c7b6 Merge commit '43aec5ad^' into merge-2.4 ...

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

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

..

perf_arithm.cpp

Merge commit '43aec5ad^' into merge-2.4

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

perf_core.cpp

refactored gpu::LUT function:

2013-06-11 17:58:04 +04:00

perf_element_operations.cpp

Revert "Revert "Merge pull request #836 from jet47:gpu-modules""

2013-06-07 13:05:39 +04:00

perf_main.cpp

fixed gpu performance tests:

2013-07-16 15:43:04 +04:00

perf_precomp.cpp

Revert "Revert "Merge pull request #836 from jet47:gpu-modules""

2013-06-07 13:05:39 +04:00

perf_precomp.hpp

Revert "Revert "Merge pull request #836 from jet47:gpu-modules""

2013-06-07 13:05:39 +04:00

perf_reductions.cpp

switched to Input/Output Array in reductions operations

2013-06-11 17:58:05 +04:00