From: Andrey Kamaev <andrey.kamaev@itseez.com>
Date: Tue, 16 Oct 2012 15:37:02 +0000 (+0400)
Subject: Revert "fixed compilation error because of DetectionBasedTracker"
X-Git-Tag: accepted/tizen/6.0/unified/20201030.111113~4110
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=075372a71cbfbbc230b1c6b35ddee595160a046c;p=platform%2Fupstream%2Fopencv.git

Revert "fixed compilation error because of DetectionBasedTracker"

This reverts commit 9b8c47399a3b4bcb8928156b7ea54fa7d0dfbd03.
---

diff --git a/modules/contrib/include/opencv2/contrib/detection_based_tracker.hpp b/modules/contrib/include/opencv2/contrib/detection_based_tracker.hpp
index dc157b1..c290318 100644
--- a/modules/contrib/include/opencv2/contrib/detection_based_tracker.hpp
+++ b/modules/contrib/include/opencv2/contrib/detection_based_tracker.hpp
@@ -27,7 +27,6 @@ class DetectionBasedTracker
                     minNeighbours(2),
                     scaleFactor(1.1f)
                 {}
-                virtual ~IDetector() {}
 
                 virtual void detect(const cv::Mat& image, std::vector<cv::Rect>& objects) = 0;
 
@@ -63,6 +62,7 @@ class DetectionBasedTracker
                 {
                     minNeighbours = value;
                 }
+                virtual ~IDetector() {}
 
             protected:
                 cv::Size minObjSize;
@@ -107,6 +107,7 @@ class DetectionBasedTracker
         };
         virtual void getObjects(std::vector<ExtObject>& result) const;
 
+
         virtual int addObject(const cv::Rect& location); //returns id of the new object
 
     protected:
@@ -169,7 +170,7 @@ class DetectionBasedTracker
 
 namespace cv
 {
-    using ::DetectionBasedTracker;
+    typedef ::DetectionBasedTracker DetectionBasedTracker;
+    
 } //end of cv namespace
-
 #endif