Normalize line endings and whitespace

samples/cpp/tutorial_code/features2D/SURF_FlannMatcher.cpp

@@ -26,7 +26,7 @@ int main( int argc, char** argv )
 
   Mat img_1 = imread( argv[1], CV_LOAD_IMAGE_GRAYSCALE );
   Mat img_2 = imread( argv[2], CV_LOAD_IMAGE_GRAYSCALE );
-  
+
   if( !img_1.data || !img_2.data )
   { std::cout<< " --(!) Error reading images " << std::endl; return -1; }
 
@@ -64,7 +64,7 @@ int main( int argc, char** argv )
 
   printf("-- Max dist : %f \n", max_dist );
   printf("-- Min dist : %f \n", min_dist );
-  
+
   //-- Draw only "good" matches (i.e. whose distance is less than 2*min_dist )
   //-- PS.- radiusMatch can also be used here.
   std::vector< DMatch > good_matches;
@@ -72,13 +72,13 @@ int main( int argc, char** argv )
   for( int i = 0; i < descriptors_1.rows; i++ )
   { if( matches[i].distance < 2*min_dist )
     { good_matches.push_back( matches[i]); }
-  }  
+  }
 
   //-- Draw only "good" matches
   Mat img_matches;
-  drawMatches( img_1, keypoints_1, img_2, keypoints_2, 
-               good_matches, img_matches, Scalar::all(-1), Scalar::all(-1), 
-               vector<char>(), DrawMatchesFlags::NOT_DRAW_SINGLE_POINTS ); 
+  drawMatches( img_1, keypoints_1, img_2, keypoints_2,
+               good_matches, img_matches, Scalar::all(-1), Scalar::all(-1),
+               vector<char>(), DrawMatchesFlags::NOT_DRAW_SINGLE_POINTS );
 
   //-- Show detected matches
   imshow( "Good Matches", img_matches );

samples/cpp/tutorial_code/features2D/SURF_Homography.cpp

@@ -27,7 +27,7 @@ int main( int argc, char** argv )
 
   Mat img_object = imread( argv[1], CV_LOAD_IMAGE_GRAYSCALE );
   Mat img_scene = imread( argv[2], CV_LOAD_IMAGE_GRAYSCALE );
-  
+
   if( !img_object.data || !img_scene.data )
   { std::cout<< " --(!) Error reading images " << std::endl; return -1; }
 
@@ -65,22 +65,22 @@ int main( int argc, char** argv )
 
   printf("-- Max dist : %f \n", max_dist );
   printf("-- Min dist : %f \n", min_dist );
-  
+
   //-- Draw only "good" matches (i.e. whose distance is less than 3*min_dist )
   std::vector< DMatch > good_matches;
 
   for( int i = 0; i < descriptors_object.rows; i++ )
   { if( matches[i].distance < 3*min_dist )
     { good_matches.push_back( matches[i]); }
-  }  
+  }
 
   Mat img_matches;
-  drawMatches( img_object, keypoints_object, img_scene, keypoints_scene, 
-               good_matches, img_matches, Scalar::all(-1), Scalar::all(-1), 
-               vector<char>(), DrawMatchesFlags::NOT_DRAW_SINGLE_POINTS ); 
+  drawMatches( img_object, keypoints_object, img_scene, keypoints_scene,
+               good_matches, img_matches, Scalar::all(-1), Scalar::all(-1),
+               vector<char>(), DrawMatchesFlags::NOT_DRAW_SINGLE_POINTS );
 
 
-  //-- Localize the object from img_1 in img_2 
+  //-- Localize the object from img_1 in img_2
   std::vector<Point2f> obj;
   std::vector<Point2f> scene;
 
@@ -88,7 +88,7 @@ int main( int argc, char** argv )
   {
     //-- Get the keypoints from the good matches
     obj.push_back( keypoints_object[ good_matches[i].queryIdx ].pt );
-    scene.push_back( keypoints_scene[ good_matches[i].trainIdx ].pt ); 
+    scene.push_back( keypoints_scene[ good_matches[i].trainIdx ].pt );
   }
 
   Mat H = findHomography( obj, scene, CV_RANSAC );
@@ -101,7 +101,7 @@ int main( int argc, char** argv )
 
   perspectiveTransform( obj_corners, scene_corners, H);
 
-   
+
   //-- Draw lines between the corners (the mapped object in the scene - image_2 )
   line( img_matches, scene_corners[0] + Point2f( img_object.cols, 0), scene_corners[1] + Point2f( img_object.cols, 0), Scalar(0, 255, 0), 4 );
   line( img_matches, scene_corners[1] + Point2f( img_object.cols, 0), scene_corners[2] + Point2f( img_object.cols, 0), Scalar( 0, 255, 0), 4 );

samples/cpp/tutorial_code/features2D/SURF_descriptor.cpp

@@ -26,7 +26,7 @@ int main( int argc, char** argv )
 
   Mat img_1 = imread( argv[1], CV_LOAD_IMAGE_GRAYSCALE );
   Mat img_2 = imread( argv[2], CV_LOAD_IMAGE_GRAYSCALE );
-  
+
   if( !img_1.data || !img_2.data )
   { return -1; }
 
@@ -55,7 +55,7 @@ int main( int argc, char** argv )
 
   //-- Draw matches
   Mat img_matches;
-  drawMatches( img_1, keypoints_1, img_2, keypoints_2, matches, img_matches ); 
+  drawMatches( img_1, keypoints_1, img_2, keypoints_2, matches, img_matches );
 
   //-- Show detected matches
   imshow("Matches", img_matches );

samples/cpp/tutorial_code/features2D/SURF_detector.cpp

@@ -26,7 +26,7 @@ int main( int argc, char** argv )
 
   Mat img_1 = imread( argv[1], CV_LOAD_IMAGE_GRAYSCALE );
   Mat img_2 = imread( argv[2], CV_LOAD_IMAGE_GRAYSCALE );
-  
+
   if( !img_1.data || !img_2.data )
   { std::cout<< " --(!) Error reading images " << std::endl; return -1; }
 
@@ -43,8 +43,8 @@ int main( int argc, char** argv )
   //-- Draw keypoints
   Mat img_keypoints_1; Mat img_keypoints_2;
 
-  drawKeypoints( img_1, keypoints_1, img_keypoints_1, Scalar::all(-1), DrawMatchesFlags::DEFAULT ); 
-  drawKeypoints( img_2, keypoints_2, img_keypoints_2, Scalar::all(-1), DrawMatchesFlags::DEFAULT ); 
+  drawKeypoints( img_1, keypoints_1, img_keypoints_1, Scalar::all(-1), DrawMatchesFlags::DEFAULT );
+  drawKeypoints( img_2, keypoints_2, img_keypoints_2, Scalar::all(-1), DrawMatchesFlags::DEFAULT );
 
   //-- Show detected (drawn) keypoints
   imshow("Keypoints 1", img_keypoints_1 );