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
|
2013-09-06 15:44:44 +04:00 |
|
Vladislav Vinogradov
|
e895b7455e
|
renamed gpu namespace -> cuda
|
2013-09-02 14:00:41 +04:00 |
|
Roman Donchenko
|
1160b04fb4
|
Fixed a build warning in softcascade.
|
2013-07-16 12:43:49 +04:00 |
|
Vladislav Vinogradov
|
76f4b02b06
|
refactored gpu::Stream (minor fixes)
|
2013-06-10 12:40:31 +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
|
0ce10532b3
|
softcascade module fixes
|
2013-04-18 13:28:34 +04:00 |
|
Vladislav Vinogradov
|
54e7c76d99
|
fixed compilation errors
|
2013-04-17 15:24:53 +04:00 |
|
Vladislav Vinogradov
|
b50090f850
|
restore cudaSafeCall
|
2013-04-08 17:25:16 +04:00 |
|
Vladislav Vinogradov
|
910ef57109
|
renamed cuda namespace to cudev
|
2013-04-08 17:25:15 +04:00 |
|
Vladislav Vinogradov
|
204a19b431
|
moved common gpu utility functionality to gpu_private.hpp
|
2013-04-08 17:25:15 +04:00 |
|
Vladislav Vinogradov
|
28b1e81883
|
renamed device -> cuda
|
2013-04-08 17:25:15 +04:00 |
|
Vladislav Vinogradov
|
2661c2e213
|
fixed warnings
|
2013-03-28 11:49:47 +04:00 |
|
Andrey Kamaev
|
be7bbe3aa9
|
Drop cv:: prefix from cv::String used inside the cv namespace
|
2013-03-22 22:14:50 +04:00 |
|
Andrey Kamaev
|
2ad7b97f1c
|
All modules (except ocl and gpu) compiles and pass tests
|
2013-03-22 22:14:26 +04:00 |
|
marina.kolpakova
|
238ea7f0f0
|
fix warnings under win.
|
2013-03-19 03:34:55 +04:00 |
|
marina.kolpakova
|
a476664144
|
fixed compilation with latest master changes
|
2013-03-14 20:12:52 +04:00 |
|
marina.kolpakova
|
6f11dc03b9
|
implement integral
|
2013-03-14 12:28:02 +04:00 |
|
marina.kolpakova
|
83e7d3dd67
|
remove generic version of GPU channel computer.
|
2013-03-14 12:28:02 +04:00 |
|
marina.kolpakova
|
3c8e66d580
|
softcascade: remove device dependency on gpu
|
2013-03-14 12:28:01 +04:00 |
|
marina.kolpakova
|
6daf17f974
|
remove softcascade host dependencies on gpu module
|
2013-03-14 12:28:01 +04:00 |
|
marina.kolpakova
|
5120322cea
|
move gpu version of soft cascade to dedicated module
|
2013-03-14 12:27:13 +04:00 |
|