Andrey Kamaev
7f542e391a
Merge branch 2.4
...
Conflicts:
android/service/engine/AndroidManifest.xml - use file from 2.4
modules/contrib/src/detection_based_tracker.cpp - move #include <pthread.h> as in 2.4
modules/java/android_test/src/org/opencv/test/OpenCVTestRunner.java - use file from 2.4
2012-11-20 19:12:00 +04:00
Andrey Kamaev
04481d9ef4
Fix Android build with clang compiler
2012-11-20 15:20:04 +04:00
Andrey Kamaev
0442bca235
Revert "partially recovered binary compatibility (ticket #2415 )"
...
This reverts commit 94b97b7a63
.
2012-10-16 19:37:12 +04:00
Vadim Pisarevsky
94b97b7a63
partially recovered binary compatibility (ticket #2415 )
2012-10-08 17:06:05 +04:00
Leonid Beynenson
2fd8ad65b9
Made changes in cv::DetectionBasedTracker -- now it can return status of the tracked objects
2012-10-04 20:50:59 +04:00
Andrey Kamaev
bbbe77e05e
Fix Android build for mips platform
2012-08-27 20:16:54 +04:00
Andrey Kamaev
c9d078ab00
Fix formatting in detection based tracker
2012-08-24 16:55:12 +04:00
Andrey Kamaev
ce11c0d1eb
Fix formatting in detection based tracker
2012-08-24 16:22:18 +04:00
Leonid Beynenson
6d3db49932
Changed DetectionBasedTracker a bit to make its method addObject to return an integer value -- the id of the new added object.
2012-07-09 14:37:12 +00:00
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).
2012-06-28 16:07:10 +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
7c160cdc30
Detection based tracker was refactored. Detector interface added.
2012-06-18 08:55:05 +00:00
Andrey Kamaev
bd0e0b5800
Merged the trunk r8589:8653 - all changes related to build warnings
2012-06-15 13:04:17 +00:00
Andrey Kamaev
49a1ba6038
Set stricter warning rules for gcc
2012-06-07 17:21:29 +00:00
Andrey Kamaev
949c4edf41
Merged the trunk r8408:8457 (inclusive)
2012-05-30 08:47:34 +00:00
Andrey Kamaev
7b5a45eac4
Merged the trunk r8384:8407 (inclusive)
2012-05-30 08:04:37 +00:00
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.
2012-05-22 13:24:37 +00:00
Leonid Beynenson
daec4d88fa
Now the DetectionBasedTracker will throw exception if it cannot load cascade detector from a file.
2012-05-21 13:54:42 +00:00
Vadim Pisarevsky
846e37ded5
fixed many warnings from GCC 4.6.1
2012-03-17 09:22:31 +00:00
Leonid Beynenson
9d8d6ba490
Changed the class DetectionBasedTracker -- changed the system of states in the subclass DetectionBasedTracker::SeparateDetectionWork, made them more logical.
2011-11-17 16:16:09 +00:00
Leonid Beynenson
e9b9dfe1c2
Made changes in DetectionBasedTracker -- refactored the class.
2011-11-17 15:17:02 +00:00
Leonid Beynenson
01c15db6d2
Committed the first version of DetectionBasedTracker.
2011-11-16 17:29:10 +00:00