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
|
12 years ago |
Roman Donchenko
|
e9a28f66ee
|
Normalized file endings.
|
12 years ago |
Andrey Kamaev
|
89356ff16d
|
Move non-CV functionality from core.hpp to separate utility.hpp header
|
12 years ago |
|
Andrey Kamaev
|
2a6fb2867e
|
Remove all using directives for STL namespace and members
Made all STL usages explicit to be able automatically find all usages of
particular class or function.
|
12 years ago |
|
Andrey Kamaev
|
04481d9ef4
|
Fix Android build with clang compiler
|
13 years ago |
|
Andrey Kamaev
|
26bcb3812c
|
Fix binary compatibility of opencv_contrib
|
13 years ago |
|
Andrey Kamaev
|
0442bca235
|
Revert "partially recovered binary compatibility (ticket #2415)"
This reverts commit 94b97b7a63.
|
13 years ago |
Vadim Pisarevsky
|
94b97b7a63
|
partially recovered binary compatibility (ticket #2415)
|
13 years ago |
Leonid Beynenson
|
2fd8ad65b9
|
Made changes in cv::DetectionBasedTracker -- now it can return status of the tracked objects
|
13 years ago |
|
Andrey Kamaev
|
bbbe77e05e
|
Fix Android build for mips platform
|
13 years ago |
|
Andrey Kamaev
|
c9d078ab00
|
Fix formatting in detection based tracker
|
13 years ago |
|
Andrey Kamaev
|
ce11c0d1eb
|
Fix formatting in detection based tracker
|
13 years ago |
Leonid Beynenson
|
6d3db49932
|
Changed DetectionBasedTracker a bit to make its method addObject to return an integer value -- the id of the new added object.
|
13 years ago |
|
Leonid Beynenson
|
35344569bf
|
Added possibility in the class DetectionBasedTracker to work as a tracker only -- without the mainDetector.
In this case new objects will be added into it by the method addObject(const cv::Rect& location).
|
13 years ago |
|
Alexander Smorkalov
|
80febef237
|
revision 8721 vas merged to head. Detection based tracker interface changed. cpp and android samples updated.
|
13 years ago |
|
Andrey Kamaev
|
bd901eb52d
|
Reverted r8721 and r8725 (issue #2080)
|
13 years ago |
|
Alexander Smorkalov
|
a3be73b5cc
|
revisions 8681 and 8688 restored. Warning fixed.
Warning: changes beak binary compatibility
|
13 years ago |
|
Andrey Kamaev
|
e8d158a5c8
|
Reverted changes breaking Android build
|
13 years ago |
|
Alexander Smorkalov
|
7c160cdc30
|
Detection based tracker was refactored. Detector interface added.
|
13 years ago |
|
Andrey Kamaev
|
bd0e0b5800
|
Merged the trunk r8589:8653 - all changes related to build warnings
|
13 years ago |
|
Andrey Kamaev
|
49a1ba6038
|
Set stricter warning rules for gcc
|
13 years ago |
|
Andrey Kamaev
|
949c4edf41
|
Merged the trunk r8408:8457 (inclusive)
|
13 years ago |
|
Andrey Kamaev
|
7b5a45eac4
|
Merged the trunk r8384:8407 (inclusive)
|
13 years ago |
|
Leonid Beynenson
|
32878f8577
|
Added a check of the DetectionBasedTracker's inner state in the main thread function of this class.
This change should fix a multithread bug in the class.
|
13 years ago |
|
Leonid Beynenson
|
daec4d88fa
|
Now the DetectionBasedTracker will throw exception if it cannot load cascade detector from a file.
|
13 years ago |
|
Vadim Pisarevsky
|
846e37ded5
|
fixed many warnings from GCC 4.6.1
|
13 years ago |
|
Leonid Beynenson
|
9d8d6ba490
|
Changed the class DetectionBasedTracker -- changed the system of states in the subclass DetectionBasedTracker::SeparateDetectionWork, made them more logical.
|
14 years ago |
|
Leonid Beynenson
|
e9b9dfe1c2
|
Made changes in DetectionBasedTracker -- refactored the class.
|
14 years ago |
|
Leonid Beynenson
|
01c15db6d2
|
Committed the first version of DetectionBasedTracker.
|
14 years ago |
