Update Samples

samples/cpp/tutorial_code/Histograms_Matching/EqualizeHist_Demo.cpp

@@ -18,8 +18,8 @@ using namespace std;
 int main( int argc, char** argv )
 {
     //! [Load image]
-    CommandLineParser parser( argc, argv, "{@input | ../data/lena.jpg | input image}" );
-    Mat src = imread( parser.get<String>( "@input" ), IMREAD_COLOR );
+    CommandLineParser parser( argc, argv, "{@input | lena.jpg | input image}" );
+    Mat src = imread( samples::findFile( parser.get<String>( "@input" ) ), IMREAD_COLOR );
     if( src.empty() )
     {
         cout << "Could not open or find the image!\n" << endl;

samples/cpp/tutorial_code/Histograms_Matching/MatchTemplate_Demo.cpp

@@ -34,7 +34,7 @@ int main( int argc, char** argv )
   if (argc < 3)
   {
     cout << "Not enough parameters" << endl;
-    cout << "Usage:\n./MatchTemplate_Demo <image_name> <template_name> [<mask_name>]" << endl;
+    cout << "Usage:\n" << argv[0] << " <image_name> <template_name> [<mask_name>]" << endl;
     return -1;
   }
 
@@ -51,7 +51,7 @@ int main( int argc, char** argv )
   if(img.empty() || templ.empty() || (use_mask && mask.empty()))
   {
     cout << "Can't read one of the images" << endl;
-    return -1;
+    return EXIT_FAILURE;
   }
   //! [load_image]
 
@@ -71,7 +71,7 @@ int main( int argc, char** argv )
 
   //! [wait_key]
   waitKey(0);
-  return 0;
+  return EXIT_SUCCESS;
   //! [wait_key]
 }
 

samples/cpp/tutorial_code/Histograms_Matching/calcHist_Demo.cpp

@@ -18,11 +18,11 @@ using namespace cv;
 int main(int argc, char** argv)
 {
     //! [Load image]
-    CommandLineParser parser( argc, argv, "{@input | ../data/lena.jpg | input image}" );
-    Mat src = imread( parser.get<String>( "@input" ), IMREAD_COLOR );
+    CommandLineParser parser( argc, argv, "{@input | lena.jpg | input image}" );
+    Mat src = imread( samples::findFile( parser.get<String>( "@input" ) ), IMREAD_COLOR );
     if( src.empty() )
     {
-        return -1;
+        return EXIT_FAILURE;
     }
     //! [Load image]
 
@@ -85,5 +85,5 @@ int main(int argc, char** argv)
     waitKey();
     //! [Display]
 
-    return 0;
+    return EXIT_SUCCESS;
 }