Merge pull request #3470 from Dmitry-Me:simplifyOverengineeredCode

pull/3472/head
Vadim Pisarevsky 11 years ago
commit bf5ff7fcd0
  1. 3
      modules/videoio/src/cap_giganetix.cpp

@ -393,7 +393,8 @@ CvCaptureCAM_Giganetix::open( int index )
for (int i = 0; i < (int) DevicesList.size() && !b_ret; i++) for (int i = 0; i < (int) DevicesList.size() && !b_ret; i++)
{ {
if((b_ret = i == index)) b_ret = (i == index);
if(b_ret)
{ {
m_device = DevicesList[i]; m_device = DevicesList[i];
b_ret = m_device->Connect (); b_ret = m_device->Connect ();

Loading…
Cancel
Save