Chiebot-Mirror
/
opencv
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #11735 from alalek:videoio_msmf_fix_configureHW_reopen_condition

Browse Source
pull/11763/head
Alexander Alekhin 7 years ago
parent 13a4700084 09c63e4f00
commit 8f24db048c
1 changed files with 2 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      modules/videoio/src/cap_msmf.cpp

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

@ -773,7 +773,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();
} }
@ -789,7 +789,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;

Write Preview
Loading…
Cancel
Save