From 714732e9bb6056b4baad5219763367041da45e05 Mon Sep 17 00:00:00 2001
From: Vadim Pisarevsky <no@email>
Date: Sat, 27 Aug 2011 10:43:53 +0000
Subject: [PATCH] fixed some more hybrid tracker build problems on Windows

---
 modules/contrib/include/opencv2/contrib/hybridtracker.hpp | 6 +++---
 modules/contrib/src/featuretracker.cpp                    | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/contrib/include/opencv2/contrib/hybridtracker.hpp b/modules/contrib/include/opencv2/contrib/hybridtracker.hpp
index 0bdcc6f7a..77df01e25 100644
--- 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 48bdfe88f..e7288bfd1 100644
--- 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)