Revert "fixed compilation error because of DetectionBasedTracker"

This reverts commit 9b8c47399a.
pull/52/head
Andrey Kamaev 12 years ago
parent e7b81688a4
commit 075372a71c
  1. 7
      modules/contrib/include/opencv2/contrib/detection_based_tracker.hpp

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

Loading…
Cancel
Save