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

..

main_nvidia.cpp

renamed gpulegacy -> cudalegacy

2013-09-02 14:00:42 +04:00

main_test_nvidia.h

renamed gpulegacy -> cudalegacy

2013-09-02 14:00:42 +04:00

NCVAutoTestLister.hpp

renamed gpulegacy -> cudalegacy

2013-09-02 14:00:42 +04:00

NCVTest.hpp

renamed gpulegacy -> cudalegacy

2013-09-02 14:00:42 +04:00

NCVTestSourceProvider.hpp

renamed gpulegacy -> cudalegacy

2013-09-02 14:00:42 +04:00

test_main.cpp

renamed gpulegacy -> cudalegacy

2013-09-02 14:00:42 +04:00

test_nvidia.cpp

replaced GPU -> CUDA

2013-09-02 14:00:44 +04:00

test_precomp.hpp

replaced gpu->cuda in files names

2013-09-02 14:00:44 +04:00

TestCompact.cpp

renamed gpulegacy -> cudalegacy

2013-09-02 14:00:42 +04:00

TestCompact.h

renamed gpulegacy -> cudalegacy

2013-09-02 14:00:42 +04:00

TestDrawRects.cpp

renamed gpulegacy -> cudalegacy

2013-09-02 14:00:42 +04:00

TestDrawRects.h

renamed gpulegacy -> cudalegacy

2013-09-02 14:00:42 +04:00

TestHaarCascadeApplication.cpp

renamed gpulegacy -> cudalegacy

2013-09-02 14:00:42 +04:00

TestHaarCascadeApplication.h

renamed gpulegacy -> cudalegacy

2013-09-02 14:00:42 +04:00

TestHaarCascadeLoader.cpp

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

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

TestHaarCascadeLoader.h

renamed gpulegacy -> cudalegacy

2013-09-02 14:00:42 +04:00

TestHypothesesFilter.cpp

renamed gpulegacy -> cudalegacy

2013-09-02 14:00:42 +04:00

TestHypothesesFilter.h

renamed gpulegacy -> cudalegacy

2013-09-02 14:00:42 +04:00

TestHypothesesGrow.cpp

renamed gpulegacy -> cudalegacy

2013-09-02 14:00:42 +04:00

TestHypothesesGrow.h

renamed gpulegacy -> cudalegacy

2013-09-02 14:00:42 +04:00

TestIntegralImage.cpp

renamed gpulegacy -> cudalegacy

2013-09-02 14:00:42 +04:00

TestIntegralImage.h

renamed gpulegacy -> cudalegacy

2013-09-02 14:00:42 +04:00

TestIntegralImageSquared.cpp

renamed gpulegacy -> cudalegacy

2013-09-02 14:00:42 +04:00

TestIntegralImageSquared.h

renamed gpulegacy -> cudalegacy

2013-09-02 14:00:42 +04:00

TestRectStdDev.cpp

renamed gpulegacy -> cudalegacy

2013-09-02 14:00:42 +04:00

TestRectStdDev.h

renamed gpulegacy -> cudalegacy

2013-09-02 14:00:42 +04:00

TestResize.cpp

renamed gpulegacy -> cudalegacy

2013-09-02 14:00:42 +04:00

TestResize.h

renamed gpulegacy -> cudalegacy

2013-09-02 14:00:42 +04:00

TestTranspose.cpp

renamed gpulegacy -> cudalegacy

2013-09-02 14:00:42 +04:00

TestTranspose.h

renamed gpulegacy -> cudalegacy

2013-09-02 14:00:42 +04:00