Fco. Javier Delgado del Hoyo
|
625fd61313
|
Removed OpticalFlowBM test from cudaoptflow module
|
2014-08-01 09:28:19 +02:00 |
|
Fco. Javier Delgado del Hoyo
|
fd10557e78
|
Removed cvCalcOpticalFlowBM from cudaoptflow test
|
2014-07-31 09:21:44 +02:00 |
|
Roman Donchenko
|
029ffb7c2d
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/core/src/gl_core_3_1.cpp
modules/core/src/opencl/convert.cl
modules/cudaimgproc/src/cuda/canny.cu
modules/cudastereo/perf/perf_stereo.cpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/test/test_denoising.cpp
modules/ocl/src/opencl/imgproc_resize.cl
samples/cpp/Qt_sample/main.cpp
|
2014-02-17 15:24:05 +04:00 |
|
Vladislav Vinogradov
|
fd88654b45
|
replaced GPU -> CUDA
|
2013-09-02 14:00:44 +04:00 |
|
Vladislav Vinogradov
|
5660d6a680
|
renamed gpuoptflow -> cudaoptflow
|
2013-09-02 14:00:43 +04:00 |
|