fixed compilation error because of DetectionBasedTracker
authorKirill Kornyakov <kirill.kornyakov@itseez.com>
Tue, 9 Oct 2012 14:55:20 +0000 (18:55 +0400)
committerKirill Kornyakov <kirill.kornyakov@itseez.com>
Tue, 9 Oct 2012 14:55:20 +0000 (18:55 +0400)
modules/contrib/include/opencv2/contrib/detection_based_tracker.hpp

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