Vladislav Vinogradov
|
ce0e595a4f
|
move the rest cuda functions to cuda legacy
|
2015-01-22 15:02:21 +03:00 |
|
Vladislav Vinogradov
|
b416e8715d
|
move labeling routines from cuda to cudalegacy
|
2015-01-22 15:02:20 +03:00 |
|
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 |
|
Vladislav Vinogradov
|
429bfad225
|
removed precomp.cpp files
|
2013-09-02 14:00:44 +04:00 |
|
Vladislav Vinogradov
|
fd88654b45
|
replaced GPU -> CUDA
|
2013-09-02 14:00:44 +04:00 |
|
Vladislav Vinogradov
|
3c34b24f1f
|
replaced gpu->cuda in files names
|
2013-09-02 14:00:44 +04:00 |
|
Vladislav Vinogradov
|
6d216d78d9
|
renamed gpulegacy -> cudalegacy
|
2013-09-02 14:00:42 +04:00 |
|