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

This commit is contained in:
Alexander Alekhin 2015-08-03 09:56:37 +00:00
commit 0f8c46f368
2 changed files with 5 additions and 4 deletions

View File

@ -111,6 +111,7 @@ public:
m_pSurfaceRGBA = 0;
m_pSurfaceNV12 = 0;
m_pSurfaceNV12_cpu_copy = 0;
D3D11_TEXTURE2D_DESC desc_rgba;

View File

@ -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();