Merge pull request opencv#9255 from marting87:marting87/gpu_samples_usage_msg

alalek · alalek · commit 6ae5a9f07ad4 · 2017-07-30T09:54:53.000Z
diff --git a/samples/gpu/cascadeclassifier.cpp b/samples/gpu/cascadeclassifier.cpp
@@ -20,7 +20,7 @@ using namespace cv::cuda;
 
 static void help()
 {
-    cout << "Usage: ./cascadeclassifier_gpu \n\t--cascade <cascade_file>\n\t(<image>|--video <video>|--camera <camera_id>)\n"
+    cout << "Usage: ./cascadeclassifier \n\t--cascade <cascade_file>\n\t(<image>|--video <video>|--camera <camera_id>)\n"
             "Using OpenCV version " << CV_VERSION << endl << endl;
 }
 
diff --git a/samples/gpu/driver_api_stereo_multi.cpp b/samples/gpu/driver_api_stereo_multi.cpp
@@ -85,7 +85,7 @@ GpuMat d_result[2];
 
 static void printHelp()
 {
-    std::cout << "Usage: driver_api_stereo_multi_gpu --left <left_image> --right <right_image>\n";
+    std::cout << "Usage: driver_api_stereo_multi --left <left_image> --right <right_image>\n";
 }
 
 int main(int argc, char** argv)
diff --git a/samples/gpu/hog.cpp b/samples/gpu/hog.cpp
@@ -99,7 +99,7 @@ class App
 static void printHelp()
 {
     cout << "Histogram of Oriented Gradients descriptor and detector sample.\n"
-         << "\nUsage: hog_gpu\n"
+         << "\nUsage: hog\n"
          << "  (<image>|--video <vide>|--camera <camera_id>) # frames source\n"
          << "  or"
          << "  (--folder <folder_path>) # load images from folder\n"
diff --git a/samples/gpu/stereo_match.cpp b/samples/gpu/stereo_match.cpp
@@ -76,7 +76,7 @@ struct App
 
 static void printHelp()
 {
-    cout << "Usage: stereo_match_gpu\n"
+    cout << "Usage: stereo_match\n"
         << "\t--left <left_view> --right <right_view> # must be rectified\n"
         << "\t--method <stereo_match_method> # BM | BP | CSBP\n"
         << "\t--ndisp <number> # number of disparity levels\n";
diff --git a/samples/gpu/stereo_multi.cpp b/samples/gpu/stereo_multi.cpp
@@ -355,7 +355,7 @@ int main(int argc, char** argv)
 {
     if (argc != 3)
     {
-        cerr << "Usage: stereo_multi_gpu <left_video> <right_video>" << endl;
+        cerr << "Usage: stereo_multi <left_video> <right_video>" << endl;
         return -1;
     }
 
diff --git a/samples/gpu/surf_keypoint_matcher.cpp b/samples/gpu/surf_keypoint_matcher.cpp
@@ -17,7 +17,7 @@ using namespace cv::cuda;
 static void help()
 {
     cout << "\nThis program demonstrates using SURF_CUDA features detector, descriptor extractor and BruteForceMatcher_CUDA" << endl;
-    cout << "\nUsage:\n\tmatcher_simple_gpu --left <image1> --right <image2>" << endl;
+    cout << "\nUsage:\n\tsurf_keypoint_matcher --left <image1> --right <image2>" << endl;
 }
 
 int main(int argc, char* argv[])

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ using namespace cv::cuda;`
`20`	`20`
`21`	`21`	`static void help()`
`22`	`22`	`{`
`23`		`- cout << "Usage: ./cascadeclassifier_gpu \n\t--cascade <cascade_file>\n\t(<image>\|--video <video>\|--camera <camera_id>)\n"`
	`23`	`+ cout << "Usage: ./cascadeclassifier \n\t--cascade <cascade_file>\n\t(<image>\|--video <video>\|--camera <camera_id>)\n"`
`24`	`24`	`"Using OpenCV version " << CV_VERSION << endl << endl;`
`25`	`25`	`}`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ GpuMat d_result[2];`
`85`	`85`
`86`	`86`	`static void printHelp()`
`87`	`87`	`{`
`88`		`- std::cout << "Usage: driver_api_stereo_multi_gpu --left <left_image> --right <right_image>\n";`
	`88`	`+ std::cout << "Usage: driver_api_stereo_multi --left <left_image> --right <right_image>\n";`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`int main(int argc, char** argv)`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ class App`
`99`	`99`	`static void printHelp()`
`100`	`100`	`{`
`101`	`101`	`cout << "Histogram of Oriented Gradients descriptor and detector sample.\n"`
`102`		`- << "\nUsage: hog_gpu\n"`
	`102`	`+ << "\nUsage: hog\n"`
`103`	`103`	`<< " (<image>\|--video <vide>\|--camera <camera_id>) # frames source\n"`
`104`	`104`	`<< " or"`
`105`	`105`	`<< " (--folder <folder_path>) # load images from folder\n"`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ struct App`
`76`	`76`
`77`	`77`	`static void printHelp()`
`78`	`78`	`{`
`79`		`- cout << "Usage: stereo_match_gpu\n"`
	`79`	`+ cout << "Usage: stereo_match\n"`
`80`	`80`	`<< "\t--left <left_view> --right <right_view> # must be rectified\n"`
`81`	`81`	`<< "\t--method <stereo_match_method> # BM \| BP \| CSBP\n"`
`82`	`82`	`<< "\t--ndisp <number> # number of disparity levels\n";`
Original file line number	Diff line number	Diff line change
`@@ -355,7 +355,7 @@ int main(int argc, char** argv)`
`355`	`355`	`{`
`356`	`356`	`if (argc != 3)`
`357`	`357`	`{`
`358`		`- cerr << "Usage: stereo_multi_gpu <left_video> <right_video>" << endl;`
	`358`	`+ cerr << "Usage: stereo_multi <left_video> <right_video>" << endl;`
`359`	`359`	`return -1;`
`360`	`360`	`}`
`361`	`361`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ using namespace cv::cuda;`
`17`	`17`	`static void help()`
`18`	`18`	`{`
`19`	`19`	`cout << "\nThis program demonstrates using SURF_CUDA features detector, descriptor extractor and BruteForceMatcher_CUDA" << endl;`
`20`		`- cout << "\nUsage:\n\tmatcher_simple_gpu --left <image1> --right <image2>" << endl;`
	`20`	`+ cout << "\nUsage:\n\tsurf_keypoint_matcher --left <image1> --right <image2>" << endl;`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`int main(int argc, char* argv[])`