From: WonderRico <rico_cotier@yahoo.fr>
Date: Tue, 6 Aug 2013 16:35:49 +0000 (+0200)
Subject: Bug #3201 fix
X-Git-Tag: accepted/tizen/6.0/unified/20201030.111113~1314^2~1106^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7e7fb0b75dde77291cf7ccb7a061063d1c9cb495;p=platform%2Fupstream%2Fopencv.git

Bug #3201 fix
---

diff --git a/modules/highgui/src/cap_dshow.cpp b/modules/highgui/src/cap_dshow.cpp
index b7cfbd9..3f364ed 100644
--- a/modules/highgui/src/cap_dshow.cpp
+++ b/modules/highgui/src/cap_dshow.cpp
@@ -3164,18 +3164,18 @@ void CvCaptureCAM_DShow::close()
 // Initialize camera input
 bool CvCaptureCAM_DShow::open( int _index )
 {
-    int try_index = _index;
     int devices = 0;
 
     close();
     devices = VI.listDevices(true);
     if (devices == 0)
         return false;
-    try_index = try_index < 0 ? 0 : (try_index > devices-1 ? devices-1 : try_index);
-    VI.setupDevice(try_index);
-    if( !VI.isDeviceSetup(try_index) )
+	if (_index < 0 || index > devices-1)
+		return false;
+    VI.setupDevice(_index);
+    if( !VI.isDeviceSetup(_index) )
         return false;
-    index = try_index;
+    index = _index;
     return true;
 }