fixed not initialized nv12_cpu_copy surface, remove odd code

This commit is contained in:
Vladimir Dudnik 2015-08-01 02:10:05 +03:00
parent 157c94c03e
commit 57bff43aec
2 changed files with 5 additions and 4 deletions

View File

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

View File

@ -175,10 +175,10 @@ static const char* keys =
template <typename TApp> template <typename TApp>
int d3d_app(int argc, char** argv, std::string& title) int d3d_app(int argc, char** argv, std::string& title)
{ {
cv::CommandLineParser parser(argc, argv, keys); \ cv::CommandLineParser parser(argc, argv, keys);
bool useCamera = parser.has("camera"); \ bool useCamera = parser.has("camera");
string file = parser.get<string>("file"); \ string file = parser.get<string>("file");
bool showHelp = parser.get<bool>("help"); \ bool showHelp = parser.get<bool>("help");
if (showHelp) if (showHelp)
help(); help();