Merge pull request opencv#9515 from berak:fix_directx_samples

alalek · alalek · commit e1ab227b6d14 · 2017-08-30T10:33:17.000Z
diff --git a/samples/directx/d3dsample.hpp b/samples/directx/d3dsample.hpp
@@ -168,17 +168,17 @@ static const char* keys =
 {
     "{c camera | true  | use camera or not}"
     "{f file   |       | movie file name  }"
-    "{h help   | false | print help info  }"
+    "{h help   |       | print help info  }"
 };
 
 
 template <typename TApp>
 int d3d_app(int argc, char** argv, std::string& title)
 {
     cv::CommandLineParser parser(argc, argv, keys);
+    std::string file = parser.get<std::string>("file");
     bool   useCamera = parser.has("camera");
-    string file      = parser.get<string>("file");
-    bool   showHelp  = parser.get<bool>("help");
+    bool   showHelp  = parser.has("help");
 
     if (showHelp)
         help();
@@ -198,8 +198,8 @@ int d3d_app(int argc, char** argv, std::string& title)
         return -1;
     }
 
-    int width  = (int)cap.get(CAP_PROP_FRAME_WIDTH);
-    int height = (int)cap.get(CAP_PROP_FRAME_HEIGHT);
+    int width  = (int)cap.get(cv::CAP_PROP_FRAME_WIDTH);
+    int height = (int)cap.get(cv::CAP_PROP_FRAME_HEIGHT);
 
     std::string wndname = title;
 
