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 |
|
Vladislav Vinogradov
|
4716f63444
|
fixed gpu performance tests:
used new CV_PERF_TEST_MAIN_WITH_IMPLS mechanism
|
2013-07-16 15:43:04 +04:00 |
|
Vladislav Vinogradov
|
4559d46190
|
fixed BroxOpticalFlow sanity test (increase epsilon value)
|
2013-06-07 16:32:43 +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
|
3156e803be
|
gpuoptflow module fixes
|
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 |
|