some improvements on tutorials

samples/cpp/tutorial_code/HighGUI/BasicLinearTransformsTrackbar.cpp

@@ -40,10 +40,15 @@ static void on_trackbar( int, void* )
  * @function main
  * @brief Main function
  */
-int main( int, char** argv )
+int main( int argc, char** argv )
 {
    /// Read image given by user
-   image = imread( argv[1] );
+   String imageName("../data/lena.jpg"); // by default
+   if (argc > 1)
+   {
+      imageName = argv[1];
+   }
+   image = imread( imageName );
 
    /// Initialize values
    alpha = 1;
@@ -54,8 +59,8 @@ int main( int, char** argv )
    namedWindow("New Image", 1);
 
    /// Create Trackbars
-   createTrackbar( "Contrast Trackbar", "New Image", &alpha, alpha_max, on_trackbar );
-   createTrackbar( "Brightness Trackbar", "New Image", &beta, beta_max, on_trackbar );
+   createTrackbar( "Contrast", "New Image", &alpha, alpha_max, on_trackbar );
+   createTrackbar( "Brightness", "New Image", &beta, beta_max, on_trackbar );
 
    /// Show some stuff
    imshow("Original Image", image);

samples/cpp/tutorial_code/ImgProc/BasicLinearTransforms.cpp

@@ -15,7 +15,7 @@ using namespace cv;
  * @function main
  * @brief Main function
  */
-int main( int, char** argv )
+int main( int argc, char** argv )
 {
     //! [basic-linear-transform-parameters]
     double alpha = 1.0; /*< Simple contrast control */
@@ -24,7 +24,12 @@ int main( int, char** argv )
 
     /// Read image given by user
     //! [basic-linear-transform-load]
-    Mat image = imread( argv[1] );
+    String imageName("../data/lena.jpg"); // by default
+    if (argc > 1)
+    {
+        imageName = argv[1];
+    }
+    Mat image = imread( imageName );
     //! [basic-linear-transform-load]
     //! [basic-linear-transform-output]
     Mat new_image = Mat::zeros( image.size(), image.type() );

samples/cpp/tutorial_code/ImgProc/Morphology_2.cpp

@@ -29,10 +29,15 @@ void Morphology_Operations( int, void* );
 /**
  * @function main
  */
-int main( int, char** argv )
+int main( int argc, char** argv )
 {
   //![load]
-  src = imread( argv[1], IMREAD_COLOR ); // Load an image
+  String imageName("../data/baboon.jpg"); // by default
+  if (argc > 1)
+  {
+  imageName = argv[1];
+  }
+  src = imread(imageName, IMREAD_COLOR); // Load an image
 
   if( src.empty() )
     { return -1; }

samples/cpp/tutorial_code/ImgProc/Threshold.cpp

@@ -30,10 +30,15 @@ void Threshold_Demo( int, void* );
 /**
  * @function main
  */
-int main( int, char** argv )
+int main( int argc, char** argv )
 {
   //! [load]
-  src = imread( argv[1], IMREAD_COLOR ); // Load an image
+  String imageName("../data/stuff.jpg"); // by default
+  if (argc > 1)
+  {
+      imageName = argv[1];
+  }
+  src = imread( imageName, IMREAD_COLOR ); // Load an image
 
   if( src.empty() )
     { return -1; }

samples/cpp/tutorial_code/ImgProc/changing_contrast_brightness_image/changing_contrast_brightness_image.cpp

@@ -58,9 +58,16 @@ void on_gamma_correction_trackbar(int, void *)
 }
 }
 
-int main( int, char** argv )
+int main( int argc, char** argv )
 {
-    img_original = imread( argv[1] );
+
+    String imageName("../data/lena.jpg"); // by default
+    if (argc > 1)
+    {
+        imageName = argv[1];
+    }
+
+    img_original = imread( imageName );
     img_corrected = Mat(img_original.rows, img_original.cols*2, img_original.type());
     img_gamma_corrected = Mat(img_original.rows, img_original.cols*2, img_original.type());
 

samples/cpp/tutorial_code/ImgTrans/HoughCircle_Demo.cpp

@@ -21,7 +21,7 @@ namespace
     const std::string usage = "Usage : tutorial_HoughCircle_Demo <path_to_input_image>\n";
 
     // initial and max values of the parameters of interests.
-    const int cannyThresholdInitialValue = 200;
+    const int cannyThresholdInitialValue = 100;
     const int accumulatorThresholdInitialValue = 50;
     const int maxAccumulatorThreshold = 200;
     const int maxCannyThreshold = 255;
@@ -55,15 +55,13 @@ int main(int argc, char** argv)
 {
     Mat src, src_gray;
 
-    if (argc < 2)
-    {
-        std::cerr<<"No input image specified\n";
-        std::cout<<usage;
-        return -1;
-    }
-
     // Read the image
-    src = imread( argv[1], IMREAD_COLOR );
+    String imageName("../data/stuff.jpg"); // by default
+    if (argc > 1)
+    {
+       imageName = argv[1];
+    }
+    src = imread( imageName, IMREAD_COLOR );
 
     if( src.empty() )
     {

samples/cpp/tutorial_code/ImgTrans/HoughLines_Demo.cpp

@@ -35,10 +35,15 @@ void Probabilistic_Hough( int, void* );
 /**
  * @function main
  */
-int main( int, char** argv )
+int main( int argc, char** argv )
 {
-   /// Read the image
-   src = imread( argv[1], IMREAD_COLOR );
+   // Read the image
+    String imageName("../data/building.jpg"); // by default
+    if (argc > 1)
+    {
+        imageName = argv[1];
+    }
+    src = imread( imageName, IMREAD_COLOR );
 
    if( src.empty() )
      { help();

samples/cpp/tutorial_code/ImgTrans/Laplace_Demo.cpp

@@ -13,7 +13,7 @@ using namespace cv;
 /**
  * @function main
  */
-int main( int, char** argv )
+int main( int argc, char** argv )
 {
   //![variables]
   Mat src, src_gray, dst;
@@ -25,7 +25,12 @@ int main( int, char** argv )
   //![variables]
 
   //![load]
-  src = imread( argv[1], IMREAD_COLOR ); // Load an image
+  String imageName("../data/lena.jpg"); // by default
+  if (argc > 1)
+  {
+    imageName = argv[1];
+  }
+  src = imread( imageName, IMREAD_COLOR ); // Load an image
 
   if( src.empty() )
     { return -1; }

samples/cpp/tutorial_code/ImgTrans/Remap_Demo.cpp

@@ -23,10 +23,12 @@ void update_map( void );
 /**
  * @function main
  */
-int main( int, char** argv )
+int main(int argc, const char** argv)
 {
   /// Load the image
-  src = imread( argv[1], IMREAD_COLOR );
+  CommandLineParser parser(argc, argv, "{@image |../data/chicky_512.png|input image name}");
+  std::string filename = parser.get<std::string>(0);
+  src = imread( filename, IMREAD_COLOR );
 
   /// Create dst, map_x and map_y with the same size as src:
   dst.create( src.size(), src.type() );

samples/cpp/tutorial_code/ImgTrans/Sobel_Demo.cpp

@@ -13,7 +13,7 @@ using namespace cv;
 /**
  * @function main
  */
-int main( int, char** argv )
+int main( int argc, char** argv )
 {
   //![variables]
   Mat src, src_gray;
@@ -25,7 +25,12 @@ int main( int, char** argv )
   //![variables]
 
   //![load]
-  src = imread( argv[1], IMREAD_COLOR ); // Load an image
+  String imageName("../data/lena.jpg"); // by default
+  if (argc > 1)
+  {
+      imageName = argv[1];
+  }
+  src = imread( imageName, IMREAD_COLOR ); // Load an image
 
   if( src.empty() )
     { return -1; }

samples/cpp/tutorial_code/ImgTrans/copyMakeBorder_demo.cpp

@@ -21,10 +21,15 @@ RNG rng(12345);
 /**
  * @function main
  */
-int main( int, char** argv )
+int main( int argc, char** argv )
 {
   //![load]
-  src = imread( argv[1], IMREAD_COLOR ); // Load an image
+  String imageName("../data/lena.jpg"); // by default
+  if (argc > 1)
+  {
+      imageName = argv[1];
+  }
+  src = imread( imageName, IMREAD_COLOR ); // Load an image
 
   if( src.empty() )
     {

samples/cpp/tutorial_code/ImgTrans/filter2D_demo.cpp

@@ -13,7 +13,7 @@ using namespace cv;
 /**
  * @function main
  */
-int main ( int, char** argv )
+int main ( int argc, char** argv )
 {
   /// Declare variables
   Mat src, dst;
@@ -26,7 +26,12 @@ int main ( int, char** argv )
   const char* window_name = "filter2D Demo";
 
   //![load]
-  src = imread( argv[1], IMREAD_COLOR ); // Load an image
+  String imageName("../data/lena.jpg"); // by default
+  if (argc > 1)
+  {
+    imageName = argv[1];
+  }
+  src = imread( imageName, IMREAD_COLOR ); // Load an image
 
   if( src.empty() )
     { return -1; }

samples/cpp/tutorial_code/ImgTrans/imageSegmentation.cpp

@@ -10,11 +10,11 @@
 using namespace std;
 using namespace cv;
 
-int main(int, char** argv)
+int main()
 {
 //! [load_image]
     // Load the image
-    Mat src = imread(argv[1]);
+    Mat src = imread("../data/cards.png");
 
     // Check if everything was fine
     if (!src.data)

samples/cpp/tutorial_code/ShapeDescriptors/findContours_demo.cpp

@@ -23,10 +23,16 @@ void thresh_callback(int, void* );
 /**
  * @function main
  */
-int main( int, char** argv )
+int main( int argc, char** argv )
 {
   /// Load source image
-  src = imread(argv[1], IMREAD_COLOR);
+  String imageName("../data/happyfish.jpg"); // by default
+  if (argc > 1)
+  {
+    imageName = argv[1];
+  }
+  src = imread(imageName, IMREAD_COLOR);
+
   if (src.empty())
   {
     cerr << "No image supplied ..." << endl;

samples/cpp/tutorial_code/calib3d/stereoBM/SBM_Sample.cpp

@@ -19,14 +19,13 @@ void readme();
  * @function main
  * @brief Main function
  */
-int main( int argc, char** argv )
+int main()
 {
-  if( argc != 3 )
-  { readme(); return -1; }
+  readme();
 
   //-- 1. Read the images
-  Mat imgLeft = imread( argv[1], IMREAD_GRAYSCALE );
-  Mat imgRight = imread( argv[2], IMREAD_GRAYSCALE );
+  Mat imgLeft = imread( "../data/rubberwhale1.png", IMREAD_GRAYSCALE );
+  Mat imgRight = imread( "../data/rubberwhale2.png", IMREAD_GRAYSCALE );
   //-- And create the image in which we will save our disparities
   Mat imgDisparity16S = Mat( imgLeft.rows, imgLeft.cols, CV_16S );
   Mat imgDisparity8U = Mat( imgLeft.rows, imgLeft.cols, CV_8UC1 );

samples/cpp/tutorial_code/features2D/AKAZE_match.cpp

@@ -63,7 +63,7 @@ int main(void)
 
     Mat res;
     drawMatches(img1, inliers1, img2, inliers2, good_matches, res);
-    imwrite("res.png", res);
+    imwrite("akaze_result.png", res);
 
     double inlier_ratio = inliers1.size() * 1.0 / matched1.size();
     cout << "A-KAZE Matching Results" << endl;
@@ -75,5 +75,8 @@ int main(void)
     cout << "# Inliers Ratio:                      \t" << inlier_ratio << endl;
     cout << endl;
 
+    imshow("result", res);
+    waitKey();
+
     return 0;
 }

samples/cpp/tutorial_code/features2D/AKAZE_tracking/planar_tracking.cpp

@@ -120,27 +120,27 @@ Mat Tracker::process(const Mat frame, Stats& stats)
 
 int main(int argc, char **argv)
 {
-    if(argc < 2) {
-        cerr << "Usage: " << endl
-             << "akaze_track input_path" << endl
-             << "  (input_path can be a camera id, like 0,1,2 or a video filename)" << endl;
-        return 1;
-    }
+    cerr << "Usage: " << endl
+         << "akaze_track input_path" << endl
+         << "  (input_path can be a camera id, like 0,1,2 or a video filename)" << endl;
 
-    std::string video_name = argv[1];
-    std::stringstream ssFormat;
-    ssFormat << atoi(argv[1]);
+    CommandLineParser parser(argc, argv, "{@input_path |0|input path can be a camera id, like 0,1,2 or a video filename}");
+    string input_path = parser.get<string>(0);
+    string video_name = input_path;
 
     VideoCapture video_in;
-    if (video_name.compare(ssFormat.str())==0) {    //test str==str(num)
-        video_in.open(atoi(argv[1]));
+
+    if ( ( isdigit(input_path[0]) && input_path.size() == 1 ) )
+    {
+    int camera_no = input_path[0] - '0';
+        video_in.open( camera_no );
     }
     else {
         video_in.open(video_name);
     }
 
     if(!video_in.isOpened()) {
-        cerr << "Couldn't open " << argv[1] << endl;
+        cerr << "Couldn't open " << video_name << endl;
         return 1;
     }
 

samples/cpp/tutorial_code/ml/introduction_to_pca/introduction_to_pca.cpp

@@ -94,12 +94,16 @@ double getOrientation(const vector<Point> &pts, Mat &img)
 /**
  * @function main
  */
-int main(int, char** argv)
+int main(int argc, char** argv)
 {
 //! [pre-process]
     // Load image
-//    Mat src = imread("pca_test1.jpg");
-    Mat src = imread(argv[1]);
+    String imageName("../data/pca_test1.jpg"); // by default
+    if (argc > 1)
+    {
+        imageName = argv[1];
+    }
+    Mat src = imread( imageName );
 
     // Check if image is loaded successfully
     if(!src.data || src.empty())

samples/cpp/tutorial_code/xfeatures2D/LATCH_match.cpp

@@ -81,7 +81,7 @@ int main(void)
 
     Mat res;
     drawMatches(img1, inliers1, img2, inliers2, good_matches, res);
-    imwrite("../../samples/data/latch_res.png", res);
+    imwrite("latch_result.png", res);
 
 
     double inlier_ratio = inliers1.size() * 1.0 / matched1.size();
@@ -93,6 +93,10 @@ int main(void)
     cout << "# Inliers:                            \t" << inliers1.size() << endl;
     cout << "# Inliers Ratio:                      \t" << inlier_ratio << endl;
     cout << endl;
+
+    imshow("result", res);
+    waitKey();
+
     return 0;
 }