mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-11 03:33:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

videoio(msmf): fix reopen condition in configureHW()

Browse Source 
`camid` value is always -1 after close().
This commit is contained in:
Alexander Alekhin 2018-06-09 16:13:52 +03:00
parent 8221f57c26
commit 09c63e4f00
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/videoio/src/cap_msmf.cpp
View File

@ -805,7 +805,7 @@ bool CvCapture_MSMF::configureHW(bool enable)
if (SUCCEEDED(D3DMgr->ResetDevice(D3DDev.Get(), mgrRToken))) if (SUCCEEDED(D3DMgr->ResetDevice(D3DDev.Get(), mgrRToken)))
{ {
captureMode = MODE_HW; captureMode = MODE_HW;
return reopen ? camid >= 0 ? open(prevcam) : open(prevfile.c_str()) : true; return reopen ? (prevcam >= 0 ? open(prevcam) : open(prevfile.c_str())) : true;
} }
D3DMgr.Reset(); D3DMgr.Reset();
} }
@ -821,7 +821,7 @@ bool CvCapture_MSMF::configureHW(bool enable)
if (D3DDev) if (D3DDev)
D3DDev.Reset(); D3DDev.Reset();
captureMode = MODE_SW; captureMode = MODE_SW;
return reopen ? camid >= 0 ? open(prevcam) : open(prevfile.c_str()) : true; return reopen ? (prevcam >= 0 ? open(prevcam) : open(prevfile.c_str())) : true;
} }
#else #else
return !enable; return !enable;