From 603fb880e5b506780a9c282eeaf6259fc075a612 Mon Sep 17 00:00:00 2001
From: Vladimir <Terran.ITX@gmail.com>
Date: Tue, 9 Jun 2015 11:31:10 +0900
Subject: [PATCH] Fixed Warnings #1

---
 .../include/opencv2/tracking/tldDataset.hpp    |  2 +-
 modules/tracking/samples/tld_test.cpp          | 18 +++++++++---------
 modules/tracking/src/tldDataset.cpp            |  2 +-
 modules/tracking/src/tldModel.cpp              |  8 ++++----
 modules/tracking/src/tldTracker.cpp            |  4 +---
 5 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/modules/tracking/include/opencv2/tracking/tldDataset.hpp b/modules/tracking/include/opencv2/tracking/tldDataset.hpp
index 00d8dd711..6d21a7d48 100644
--- a/modules/tracking/include/opencv2/tracking/tldDataset.hpp
+++ b/modules/tracking/include/opencv2/tracking/tldDataset.hpp
@@ -48,7 +48,7 @@ namespace cv
 {
 	namespace tld
 	{
-		CV_EXPORTS cv::Rect2d tld_InitDataset(int datasetInd, char* rootPath = "TLD_dataset");
+		CV_EXPORTS cv::Rect2d tld_InitDataset(int datasetInd, const char* rootPath = "TLD_dataset");
 		CV_EXPORTS cv::Mat tld_getNextDatasetFrame();
 	}
 }
diff --git a/modules/tracking/samples/tld_test.cpp b/modules/tracking/samples/tld_test.cpp
index ac89968a6..472d2c92d 100644
--- a/modules/tracking/samples/tld_test.cpp
+++ b/modules/tracking/samples/tld_test.cpp
@@ -93,7 +93,7 @@ static void onMouse(int event, int x, int y, int, void*)
 	}
 }
 
-int main(int argc, char** argv)
+int main()
 {
 	//
 	//  "MIL", "BOOSTING", "MEDIANFLOW", "TLD"
@@ -152,12 +152,12 @@ int main(int argc, char** argv)
 	int frameCounter = 0;
 
 	//Time measurment
-	float e3 = getTickCount();
+	int64 e3 = getTickCount();
 
 	for (;;)
 	{
 		//Time measurment
-		float e1 = getTickCount();
+		int64 e1 = getTickCount();
 		//Frame num
 		frameCounter++;
 		if (frameCounter == NUM_TEST_FRAMES) break;
@@ -208,18 +208,18 @@ int main(int argc, char** argv)
 
 
 			//Time measurment
-			float e2 = getTickCount();
-			float t1 = (e2 - e1) / getTickFrequency();
-			cout << frameCounter << "\tframe :  " << t1 * 1000 << "ms" << endl;
+			int64 e2 = getTickCount();
+			double t1 = (e2 - e1) / getTickFrequency();
+			cout << frameCounter << "\tframe :  " << t1 * 1000.0 << "ms" << endl;
 
 			//waitKey(0);
 		}
 	}
 
 	//Time measurment
-	float e4 = getTickCount();
-	float t2 = (e4 - e3) / getTickFrequency();
-	cout << "Average Time for Frame:  " << t2 * 1000 / frameCounter << "ms" << endl;
+	int64 e4 = getTickCount();
+	double t2 = (e4 - e3) / getTickFrequency();
+	cout << "Average Time for Frame:  " << t2 * 1000.0 / frameCounter << "ms" << endl;
 	cout << "Average FPS:  " << 1.0 / t2*frameCounter << endl;
 
 
diff --git a/modules/tracking/src/tldDataset.cpp b/modules/tracking/src/tldDataset.cpp
index c816858b0..81ecd6f72 100644
--- a/modules/tracking/src/tldDataset.cpp
+++ b/modules/tracking/src/tldDataset.cpp
@@ -49,7 +49,7 @@ namespace cv
 		int frameNum = 0;
 		bool flagPNG = false;
 
-		cv::Rect2d tld_InitDataset(int datasetInd, char* rootPath)
+		cv::Rect2d tld_InitDataset(int datasetInd,const char* rootPath)
 		{
 			char* folderName = "";
 			int x, y, w, h;
diff --git a/modules/tracking/src/tldModel.cpp b/modules/tracking/src/tldModel.cpp
index 4b0e07100..15e7b945e 100644
--- a/modules/tracking/src/tldModel.cpp
+++ b/modules/tracking/src/tldModel.cpp
@@ -263,11 +263,11 @@ namespace cv
 			(*proxyN)++;
 		}
 
-		void TrackerTLDModel::printme(FILE*  port)
+		void TrackerTLDModel::printme(FILE* port)
 		{
-			//dfprintf((port, "TrackerTLDModel:\n"));
-			//dfprintf((port, "\tpositiveExamples.size() = %d\n", (int)positiveExamples.size()));
-			//dfprintf((port, "\tnegativeExamples.size() = %d\n", (int)negativeExamples.size()));
+			dfprintf((port, "TrackerTLDModel:\n"));
+			dfprintf((port, "\tpositiveExamples.size() = %d\n", (int)positiveExamples.size()));
+			dfprintf((port, "\tnegativeExamples.size() = %d\n", (int)negativeExamples.size()));
 		}
 
 
diff --git a/modules/tracking/src/tldTracker.cpp b/modules/tracking/src/tldTracker.cpp
index c55f281b4..962a0f7c4 100644
--- a/modules/tracking/src/tldTracker.cpp
+++ b/modules/tracking/src/tldTracker.cpp
@@ -89,9 +89,7 @@ bool TrackerTLDImpl::initImpl(const Mat& image, const Rect2d& boundingBox)
         myBoundingBox.width *= scale;
         myBoundingBox.height *= scale;
     }
-    model = Ptr<TrackerTLDModel>(new TrackerTLDModel(params, image_gray, myBoundingBox, data->getMinSize()));
-	TrackerTLDModel* tldModel = ((TrackerTLDModel*)static_cast<TrackerModel*>(model));
-    
+    model = Ptr<TrackerTLDModel>(new TrackerTLDModel(params, image_gray, myBoundingBox, data->getMinSize()));    
 
     data->confident = false;
     data->failedLastTime = false;