Roman Donchenko
|
48432502b6
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
cmake/OpenCVDetectCUDA.cmake
doc/tutorials/introduction/linux_gcc_cmake/linux_gcc_cmake.rst
modules/core/CMakeLists.txt
modules/features2d/perf/opencl/perf_brute_force_matcher.cpp
modules/highgui/src/grfmt_tiff.cpp
modules/imgproc/src/clahe.cpp
modules/imgproc/src/moments.cpp
modules/nonfree/CMakeLists.txt
modules/ocl/perf/perf_ml.cpp
modules/superres/CMakeLists.txt
|
2014-02-25 15:02:24 +04:00 |
|
Vladislav Vinogradov
|
8282f6ebc1
|
renamed gpu::cudev namespace -> cuda::device
cudev is used for new device layer
|
2013-09-02 14:00:41 +04:00 |
|
Vladislav Vinogradov
|
e895b7455e
|
renamed gpu namespace -> cuda
|
2013-09-02 14:00:41 +04:00 |
|
Vladislav Vinogradov
|
3eeaa9189c
|
Revert "Revert "Merge pull request #836 from jet47:gpu-modules""
|
2013-06-07 13:05:39 +04:00 |
|
Andrey Kamaev
|
416fb50594
|
Revert "Merge pull request #836 from jet47:gpu-modules"
This reverts commit fba72cb60d, reversing
changes made to 02131ffb62.
|
2013-04-18 15:03:50 +04:00 |
|
Vladislav Vinogradov
|
f375c86dfb
|
photo module fixes
|
2013-04-18 12:36:11 +04:00 |
|
Vladislav Vinogradov
|
43d5e2d8b4
|
removed gpu BORDER_* constants
|
2013-04-18 11:33:34 +04:00 |
|
Vladislav Vinogradov
|
e72ba73e70
|
moved gpu nlm to photo module
|
2013-04-18 11:33:33 +04:00 |
|