Merge pull request opencv#5107 from vladimir-dudnik:d3d-interop-upd

alalek · alalek · commit 0f8c46f36899 · 2015-08-03T09:56:37.000Z
diff --git a/samples/directx/d3d11_interop.cpp b/samples/directx/d3d11_interop.cpp
@@ -111,6 +111,7 @@ class D3D11WinApp : public D3DSample
 
         m_pSurfaceRGBA = 0;
         m_pSurfaceNV12 = 0;
+        m_pSurfaceNV12_cpu_copy = 0;
 
         D3D11_TEXTURE2D_DESC desc_rgba;
 
diff --git a/samples/directx/d3dsample.hpp b/samples/directx/d3dsample.hpp
@@ -175,10 +175,10 @@ static const char* keys =
 template <typename TApp>
 int d3d_app(int argc, char** argv, std::string& title)
 {
-    cv::CommandLineParser parser(argc, argv, keys); \
-    bool   useCamera = parser.has("camera"); \
-    string file      = parser.get<string>("file"); \
-    bool   showHelp  = parser.get<bool>("help"); \
+    cv::CommandLineParser parser(argc, argv, keys);
+    bool   useCamera = parser.has("camera");
+    string file      = parser.get<string>("file");
+    bool   showHelp  = parser.get<bool>("help");
 
     if (showHelp)
         help();
