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 |
|
Andrey Kamaev
|
5e048d1fa5
|
Move C API of opencv_objdetect to separate file
Also move cv::linemod to own header
|
2013-04-12 14:37:01 +04:00 |
|
Andrey Kamaev
|
0738ea7d0f
|
Make highgui.hpp independent from C API
|
2013-04-08 15:47:29 +04:00 |
|
Andrey Kamaev
|
ecf6b5a87c
|
Making all dependencies from highgui module optional
|
2012-06-26 07:29:36 +00:00 |
|
Alexander Smorkalov
|
80febef237
|
revision 8721 vas merged to head. Detection based tracker interface changed. cpp and android samples updated.
|
2012-06-25 17:01:55 +00:00 |
|
Andrey Kamaev
|
bd901eb52d
|
Reverted r8721 and r8725 (issue #2080)
|
2012-06-24 08:50:03 +00:00 |
|
Alexander Smorkalov
|
a3be73b5cc
|
revisions 8681 and 8688 restored. Warning fixed.
Warning: changes beak binary compatibility
|
2012-06-21 14:37:28 +00:00 |
|
Andrey Kamaev
|
e8d158a5c8
|
Reverted changes breaking Android build
|
2012-06-19 08:10:05 +00:00 |
|
Alexander Smorkalov
|
1736cc9739
|
Code style fix. dbt face detection example turned off for Windows.
|
2012-06-18 10:59:28 +00:00 |
|
Alexander Smorkalov
|
7c160cdc30
|
Detection based tracker was refactored. Detector interface added.
|
2012-06-18 08:55:05 +00:00 |
|