Fix opencv#4

Author: Auron-X

modules/datasets/include/opencv2/datasets/track_alov.hpp

@@ -76,8 +76,8 @@ class CV_EXPORTS TRACK_alov : public Dataset
     static Ptr<TRACK_alov> create();
 
     virtual void load(const std::string &path) = 0;
-	
-	//Load only frames with annotations (~every 5-th frame) 
+
+	//Load only frames with annotations (~every 5-th frame)
 	virtual void loadAnnotatedOnly(const std::string &path) = 0;
 
     virtual int getDatasetsNum() = 0;
@@ -89,8 +89,8 @@ class CV_EXPORTS TRACK_alov : public Dataset
     virtual bool getNextFrame(Mat &frame) = 0;
 	virtual vector <Point2f> getNextGT() = 0;
 
-	//Get frame/GT by datasetID (1..N) frameID (1..K) 
-	virtual bool getFrame(Mat &frame, int datasetID, int frameID) = 0;    
+	//Get frame/GT by datasetID (1..N) frameID (1..K)
+	virtual bool getFrame(Mat &frame, int datasetID, int frameID) = 0;
 	virtual vector <Point2f> getGT(int datasetID, int frameID) = 0;
 
 protected:

modules/datasets/src/track_alov.cpp

@@ -158,12 +158,12 @@ namespace cv
 			//Load frames
 			//Loop for all sections of ALOV300++ (14 sections)
 			for (int i = 0; i < 14; i++)
-			{		
+			{
 				//Loop for all videos in section
 				for (int k = 0; k < sectionSizes[i]; k++)
 				{
 					vector <Ptr<TRACK_alovObj> > objects;
-					
+
 					//Make a list of datasets lengths
 					int currFrameID = 0;
 
@@ -177,8 +177,8 @@ namespace cv
 						//Make ALOV300++ Object
 						Ptr<TRACK_alovObj> currObj(new TRACK_alovObj);
 						currObj->imagePath = fullPath;
-						currObj->id = currFrameID;												
-						
+						currObj->id = currFrameID;
+
 						currObj->gtbb.push_back(Point2d(0, 0));
 						currObj->gtbb.push_back(Point2d(0, 0));
 						currObj->gtbb.push_back(Point2d(0, 0));
@@ -222,7 +222,7 @@ namespace cv
 					do
 					{
 						//Make ALOV300++ Object
-						string tmp;					
+						string tmp;
 
 						getline(annoList, tmp);
 						std::istringstream in(tmp);
@@ -239,7 +239,7 @@ namespace cv
 					} while (!annoList.eof());
 				}
 			}
-            
+
             return;
         }
 
@@ -266,13 +266,12 @@ namespace cv
 					{
 						printf("Error: Can't open annotation file *.ANN!!!\n");
 						break;
-					}					
-					
-					bool trFLG = true;
+					}
+
 					int framesNum = 0;
 
 					do
-					{						
+					{
 						//Make  ALOV300++ Object
 						Ptr<TRACK_alovObj> currObj(new TRACK_alovObj);
 						string tmp;
@@ -344,7 +343,7 @@ namespace cv
         }
 
         bool  TRACK_alovImpl::getNextFrame(Mat &frame)
-        {			
+        {
             if (frameCounter >= (int)data[activeDatasetID - 1].size())
                 return false;
             string imgPath = data[activeDatasetID - 1][frameCounter]->imagePath;

modules/tracking/src/gtrUtils.cpp

@@ -47,7 +47,7 @@ namespace cv
 	namespace gtr
 	{
 		double generateRandomLaplacian(double b, double m)
-		{		
+		{
 			double t = (double)rand() / (RAND_MAX);
 			double n = (double)rand() / (RAND_MAX);
 
@@ -78,7 +78,7 @@ namespace cv
 			Rect2f targetPatchRect, searchPatchRect;
 			Mat targetPatch, searchPatch;
 
-			//Crop Target Patch			
+			//Crop Target Patch
 
 			//Previous frame GTBBs center
 			prevCenter.x = prevBB.x + prevBB.width / 2.0;
@@ -88,7 +88,7 @@ namespace cv
 			targetPatchRect.y = prevCenter.y - prevBB.height*padTarget / 2.0;
 			targetPatchRect.width = prevBB.width*padTarget;
 			targetPatchRect.height = prevBB.height*padTarget;
-						
+
 			targetPatch = prevFrame(targetPatchRect);
 
 
@@ -116,7 +116,7 @@ namespace cv
 				searchPatchRect.height = prevBB.height*padSearch*ds;
 				searchPatchRect.x = currCenter.x + dx - searchPatchRect.width / 2;
 				searchPatchRect.y = currCenter.y + dy - searchPatchRect.height / 2;
-				
+
 				searchPatch = currFrame(searchPatchRect);
 
 				//Calculate Relative GTBB in search patch
@@ -136,8 +136,7 @@ namespace cv
 
 			return trainingSamples;
 		}
-						
+
 		vector <TrainingSample> gatherImageSamples();
 	}
 }
- 

modules/tracking/src/gtrUtils.hpp

@@ -23,7 +23,7 @@ namespace cv
 		const double padTarget = 2.0;
 		const double padSearch = 2.0;
 
-		//Scale parameters for Lablace distribution for Translation/Scale 
+		//Scale parameters for Lablace distribution for Translation/Scale
 		const double bX = 1.0/5;
 		const double bY = 1.0 / 5;
 		const double bS = 1.0/15;
@@ -54,7 +54,7 @@ namespace cv
 		//Make a batch for training
 		vector <TrainingSample> makeBatch();
 
-		//Gather samples from random video frame 
+		//Gather samples from random video frame
 		vector <TrainingSample> gatherFrameSamples(Mat prevFrame, Mat currFrame, Rect2f prevBB, Rect2f currBB);
 
 		//Gather samples from random still image