Vladislav Vinogradov
|
0c7663eb3b
|
Merge branch 'master' into gpu-cuda-rename
Conflicts:
modules/core/include/opencv2/core/cuda.hpp
modules/cudacodec/src/thread.cpp
modules/cudacodec/src/thread.hpp
modules/superres/perf/perf_superres.cpp
modules/superres/src/btv_l1_cuda.cpp
modules/superres/src/optical_flow.cpp
modules/videostab/src/global_motion.cpp
modules/videostab/src/inpainting.cpp
samples/cpp/stitching_detailed.cpp
samples/cpp/videostab.cpp
samples/gpu/stereo_multi.cpp
|
12 years ago |
Vladislav Vinogradov
|
fd88654b45
|
replaced GPU -> CUDA
|
12 years ago |
Vladislav Vinogradov
|
a0ae602bb7
|
renamed gpuimgproc -> cudaimgproc
|
12 years ago |
Vladislav Vinogradov
|
219b662127
|
renamed gpufilters -> cudafilters
|
12 years ago |
Vladislav Vinogradov
|
e895b7455e
|
renamed gpu namespace -> cuda
|
12 years ago |
Vladislav Vinogradov
|
5da724001f
|
made dependecy from gpufilters optional
|
12 years ago |
Vladislav Vinogradov
|
4087a45e73
|
refactored HoughCircles (converted it into Algorithm)
|
12 years ago |
Vladislav Vinogradov
|
48fb8c4f8a
|
refactored gpu::Canny (converted it into Algorithm)
|
12 years ago |
Vladislav Vinogradov
|
12ae11e2ff
|
refactored Separable Linear Filters
|
12 years ago |
Vladislav Vinogradov
|
3eeaa9189c
|
Revert "Revert "Merge pull request #836 from jet47:gpu-modules""
|
12 years ago |
Andrey Kamaev
|
416fb50594
|
Revert "Merge pull request #836 from jet47:gpu-modules"
This reverts commit fba72cb60d , reversing
changes made to 02131ffb62 .
|
12 years ago |
Vladislav Vinogradov
|
c0b3424a23
|
gpuimgproc module fixes
|
12 years ago |