put the detection-based tracker back (to objdetect module), so that the Android face detection sample builds fine. The patch by Konstantin Matskevich that adds C++11 threads support has been merged in too. Also, fixed compile error in the doc builder.

2014-06-24 21:16:09 +04:00
parent 3858f2291d
commit 07c0d50edf
6 changed files with 1369 additions and 2 deletions
--- a/modules/objdetect/include/opencv2/objdetect.hpp
+++ b/modules/objdetect/include/opencv2/objdetect.hpp
@@ -317,5 +317,6 @@ public:

 #include "opencv2/objdetect/linemod.hpp"
 #include "opencv2/objdetect/erfilter.hpp"
+#include "opencv2/objdetect/detection_based_tracker.hpp"

 #endif