Merge pull request #1737 from sturkmen72:update_TrackerCSRT

pull/1749/head
Alexander Alekhin 7 years ago
commit e29fc6b759
  1. 2
      modules/tracking/include/opencv2/tracking/tracker.hpp
  2. 6
      modules/tracking/src/trackerCSRT.cpp

@ -1522,7 +1522,7 @@ public:
CV_WRAP static Ptr<TrackerCSRT> create(); CV_WRAP static Ptr<TrackerCSRT> create();
virtual void setInitialMask(const Mat mask) = 0; CV_WRAP virtual void setInitialMask(InputArray mask) = 0;
virtual ~TrackerCSRT() CV_OVERRIDE {} virtual ~TrackerCSRT() CV_OVERRIDE {}
}; };

@ -35,7 +35,7 @@ protected:
TrackerCSRT::Params params; TrackerCSRT::Params params;
bool initImpl(const Mat& image, const Rect2d& boundingBox) CV_OVERRIDE; bool initImpl(const Mat& image, const Rect2d& boundingBox) CV_OVERRIDE;
virtual void setInitialMask(const Mat mask) CV_OVERRIDE; virtual void setInitialMask(InputArray mask) CV_OVERRIDE;
bool updateImpl(const Mat& image, Rect2d& boundingBox) CV_OVERRIDE; bool updateImpl(const Mat& image, Rect2d& boundingBox) CV_OVERRIDE;
void update_csr_filter(const Mat &image, const Mat &my_mask); void update_csr_filter(const Mat &image, const Mat &my_mask);
void update_histograms(const Mat &image, const Rect &region); void update_histograms(const Mat &image, const Rect &region);
@ -99,9 +99,9 @@ void TrackerCSRTImpl::write(cv::FileStorage& fs) const
params.write(fs); params.write(fs);
} }
void TrackerCSRTImpl::setInitialMask(const Mat mask) void TrackerCSRTImpl::setInitialMask(InputArray mask)
{ {
preset_mask = mask; preset_mask = mask.getMat();
} }
bool TrackerCSRTImpl::check_mask_area(const Mat &mat, const double obj_area) bool TrackerCSRTImpl::check_mask_area(const Mat &mat, const double obj_area)

Loading…
Cancel
Save