fix the compilation bug of main.cpp in perf test and accuracy test on ocl module...

diff --git a/modules/ocl/perf/main.cpp b/modules/ocl/perf/main.cpp
index fb80136..663bc19 100644 (file)
--- a/modules/ocl/perf/main.cpp
+++ b/modules/ocl/perf/main.cpp
@@ -79,77 +79,47 @@ int main(int argc, char **argv)
     TS::ptr()->init("ocl");
     InitGoogleTest(&argc, argv);
     const char *keys =
-
-        "{ h | help     | false              | print help message }"
-
-        "{ w | workdir  | ../../../samples/c/| set working directory }"
-
-        "{ t | type     | gpu                | set device type:cpu or gpu}"
-
-        "{ p | platform | 0                  | set platform id }"
-
-        "{ d | device   | 0                  | set device id }";
-
-
+        "{ h | false              | print help message }"
+               "{ w | ../../../samples/c/| set working directory i.e. -w=C:\\}"
+        "{ t | gpu                | set device type:i.e. -t=cpu or gpu}"
+        "{ p | 0                  | set platform id i.e. -p=0}"
+        "{ d | 0                  | set device id i.e. -d=0}";
 
     CommandLineParser cmd(argc, argv, keys);
-
-    if (cmd.get<bool>("help"))
-
+    if (cmd.get<string>("h")=="true")
     {
-
         cout << "Avaible options besides goole test option:" << endl;
-
-        cmd.printParams();
+        cmd.printMessage();
+        return 0;
     }
-
-    workdir = cmd.get<string>("workdir");
-
-    string type = cmd.get<string>("type");
-
-    unsigned int pid = cmd.get<unsigned int>("platform");
-
-    int device = cmd.get<int>("device");
-
-
+    workdir = cmd.get<string>("w");
+    string type = cmd.get<string>("t");
+    unsigned int pid = cmd.get<unsigned int>("p");
+    int device = cmd.get<int>("d");
     print_info();
     int flag = CVCL_DEVICE_TYPE_GPU;
 
     if(type == "cpu")
-
     {
-
         flag = CVCL_DEVICE_TYPE_CPU;
-
     }
     std::vector<cv::ocl::Info> oclinfo;
     int devnums = getDevice(oclinfo);
     if(devnums <= device || device < 0)
-
     {
-
         std::cout << "device invalid\n";
-
         return -1;
-
     }
 
     if(pid >= oclinfo.size())
-
     {
-
         std::cout << "platform invalid\n";
-
         return -1;
-
     }
 
     if(pid != 0 || device != 0)
-
     {
-
         setDevice(oclinfo[pid], device);
-
     }
 
     cout << "Device type:" << type << endl << "Device name:" << oclinfo[pid].DeviceName[device] << endl;

diff --git a/modules/ocl/test/main.cpp b/modules/ocl/test/main.cpp
index 856828d..d3273f7 100644 (file)
--- a/modules/ocl/test/main.cpp
+++ b/modules/ocl/test/main.cpp
@@ -79,23 +79,23 @@ int main(int argc, char **argv)
     TS::ptr()->init("ocl");
     InitGoogleTest(&argc, argv);
     const char *keys =
-        "{ h | help     | false              | print help message }"
-        "{ w | workdir  | ../../../samples/c/| set working directory }"
-        "{ t | type     | gpu                | set device type:cpu or gpu}"
-        "{ p | platform | 0                  | set platform id }"
-        "{ d | device   | 0                  | set device id }";
+        "{ h | false              | print help message }"
+               "{ w | ../../../samples/c/| set working directory i.e. -w=C:\\}"
+        "{ t | gpu                | set device type:i.e. -t=cpu or gpu}"
+        "{ p | 0                  | set platform id i.e. -p=0}"
+        "{ d | 0                  | set device id i.e. -d=0}";
 
     CommandLineParser cmd(argc, argv, keys);
-    if (cmd.get<bool>("help"))
+    if (cmd.get<string>("h")=="true")
     {
         cout << "Avaible options besides goole test option:" << endl;
-        cmd.printParams();
+        cmd.printMessage();
         return 0;
     }
-    workdir = cmd.get<string>("workdir");
-    string type = cmd.get<string>("type");
-    unsigned int pid = cmd.get<unsigned int>("platform");
-    int device = cmd.get<int>("device");
+    workdir = cmd.get<string>("w");
+    string type = cmd.get<string>("t");
+    unsigned int pid = cmd.get<unsigned int>("p");
+    int device = cmd.get<int>("d");
 
     print_info();
     int flag = CVCL_DEVICE_TYPE_GPU;