Roman Donchenko
|
18bb951574
|
Nuked the rest of the precomp.cpp files.
Consider this a part of merging #1357.
|
2013-09-02 19:53:45 +04:00 |
|
Roman Donchenko
|
9218f4976c
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/contrib/src/retina.cpp
modules/gpu/perf/perf_video.cpp
modules/gpuoptflow/src/tvl1flow.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_calib3d.cpp
modules/ocl/perf/perf_color.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/src/precomp.hpp
samples/gpu/stereo_multi.cpp
|
2013-09-02 19:44:51 +04:00 |
|
Roman Donchenko
|
2d6f35d6ed
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/gpuwarping/src/cuda/resize.cu
modules/gpuwarping/src/resize.cpp
modules/gpuwarping/test/test_resize.cpp
modules/ocl/perf/main.cpp
modules/ocl/perf/perf_calib3d.cpp
modules/ocl/perf/perf_canny.cpp
modules/ocl/perf/perf_color.cpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/perf/perf_precomp.cpp
modules/ocl/perf/perf_precomp.hpp
|
2013-08-27 19:15:47 +04:00 |
|
Vladislav Vinogradov
|
cd2b7448f4
|
eliminate unnecessary double arithmetics in CUDA
|
2013-08-19 15:56:45 +04:00 |
|
Vladislav Vinogradov
|
9eea9835ab
|
switched to Input/Output Array in Color Processing
|
2013-07-17 11:39:52 +04:00 |
|
Vladislav Vinogradov
|
439c3574ed
|
renamed gpu_private.hpp to private.gpu.hpp
|
2013-06-10 12:40:32 +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 fba72cb60d27905cce9f1390250adf13d5355c03, reversing
changes made to 02131ffb620f349617a65da334591eca5d3cb23b.
|
2013-04-18 15:03:50 +04:00 |
|
Vladislav Vinogradov
|
3156e803be
|
gpuoptflow module fixes
|
2013-04-18 11:33:34 +04:00 |
|
Vladislav Vinogradov
|
43d5e2d8b4
|
removed gpu BORDER_* constants
|
2013-04-18 11:33:34 +04:00 |
|
Vladislav Vinogradov
|
ac0f506d0e
|
split gpuvideo onto gpuoptflow and gpubgsegm
|
2013-04-18 11:33:34 +04:00 |
|