Commit 714732e9 authored by Vadim Pisarevsky's avatar Vadim Pisarevsky

fixed some more hybrid tracker build problems on Windows

parent 1bae6413
...@@ -134,7 +134,7 @@ public: ...@@ -134,7 +134,7 @@ public:
CvMeanShiftTrackerParams params; CvMeanShiftTrackerParams params;
CvMeanShiftTracker(); CvMeanShiftTracker();
CvMeanShiftTracker(CvMeanShiftTrackerParams _params = CvMeanShiftTrackerParams()); explicit CvMeanShiftTracker(CvMeanShiftTrackerParams _params);
~CvMeanShiftTracker(); ~CvMeanShiftTracker();
void newTrackingWindow(Mat image, Rect selection); void newTrackingWindow(Mat image, Rect selection);
RotatedRect updateTrackingWindow(Mat image); RotatedRect updateTrackingWindow(Mat image);
...@@ -167,7 +167,7 @@ public: ...@@ -167,7 +167,7 @@ public:
CvFeatureTrackerParams params; CvFeatureTrackerParams params;
CvFeatureTracker(); CvFeatureTracker();
CvFeatureTracker(CvFeatureTrackerParams params = CvFeatureTrackerParams(0,0)); explicit CvFeatureTracker(CvFeatureTrackerParams params);
~CvFeatureTracker(); ~CvFeatureTracker();
void newTrackingWindow(Mat image, Rect selection); void newTrackingWindow(Mat image, Rect selection);
Rect updateTrackingWindow(Mat image); Rect updateTrackingWindow(Mat image);
...@@ -206,7 +206,7 @@ private: ...@@ -206,7 +206,7 @@ private:
public: public:
CvHybridTrackerParams params; CvHybridTrackerParams params;
CvHybridTracker(); CvHybridTracker();
CvHybridTracker(CvHybridTrackerParams params = CvHybridTrackerParams()); explicit CvHybridTracker(CvHybridTrackerParams params);
~CvHybridTracker(); ~CvHybridTracker();
void newTracker(Mat image, Rect selection); void newTracker(Mat image, Rect selection);
......
...@@ -197,6 +197,7 @@ Rect CvFeatureTracker::updateTrackingWindowWithFlow(Mat image) ...@@ -197,6 +197,7 @@ Rect CvFeatureTracker::updateTrackingWindowWithFlow(Mat image)
swap(features[0], features[1]); swap(features[0], features[1]);
image.copyTo(prev_image); image.copyTo(prev_image);
return prev_trackwindow;
} }
void CvFeatureTracker::setTrackingWindow(Rect _window) void CvFeatureTracker::setTrackingWindow(Rect _window)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment