fixed some more hybrid tracker build problems on Windows

diff --git a/modules/contrib/include/opencv2/contrib/hybridtracker.hpp b/modules/contrib/include/opencv2/contrib/hybridtracker.hpp
index 0bdcc6f..77df01e 100644 (file)
--- a/modules/contrib/include/opencv2/contrib/hybridtracker.hpp
+++ b/modules/contrib/include/opencv2/contrib/hybridtracker.hpp
@@ -134,7 +134,7 @@ public:
        CvMeanShiftTrackerParams params;
 
        CvMeanShiftTracker();
-       CvMeanShiftTracker(CvMeanShiftTrackerParams _params = CvMeanShiftTrackerParams());
+       explicit CvMeanShiftTracker(CvMeanShiftTrackerParams _params);
        ~CvMeanShiftTracker();
        void newTrackingWindow(Mat image, Rect selection);
        RotatedRect updateTrackingWindow(Mat image);
@@ -167,7 +167,7 @@ public:
        CvFeatureTrackerParams params;
 
        CvFeatureTracker();
-       CvFeatureTracker(CvFeatureTrackerParams params = CvFeatureTrackerParams(0,0));
+       explicit CvFeatureTracker(CvFeatureTrackerParams params);
        ~CvFeatureTracker();
        void newTrackingWindow(Mat image, Rect selection);
        Rect updateTrackingWindow(Mat image);
@@ -206,7 +206,7 @@ private:
 public:
        CvHybridTrackerParams params;
        CvHybridTracker();
-       CvHybridTracker(CvHybridTrackerParams params = CvHybridTrackerParams());
+       explicit CvHybridTracker(CvHybridTrackerParams params);
        ~CvHybridTracker();
 
        void newTracker(Mat image, Rect selection);

diff --git a/modules/contrib/src/featuretracker.cpp b/modules/contrib/src/featuretracker.cpp
index 48bdfe8..e7288bf 100644 (file)
--- a/modules/contrib/src/featuretracker.cpp
+++ b/modules/contrib/src/featuretracker.cpp
@@ -197,6 +197,7 @@ Rect CvFeatureTracker::updateTrackingWindowWithFlow(Mat image)
 
        swap(features[0], features[1]);
        image.copyTo(prev_image);
+       return prev_trackwindow;
 }
 
 void CvFeatureTracker::setTrackingWindow(Rect _window)