return NULL in the case of incorrect camera index (ticket #710)

b58d9edc · Vadim Pisarevsky · 9170ff6f · b58d9edc
Commit b58d9edc authored May 21, 2011 by Vadim Pisarevsky
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 5 deletions

cap_qtkit.mm modules/highgui/src/cap_qtkit.mm +4 -5

No files found.
--- a/modules/highgui/src/cap_qtkit.mm
+++ b/modules/highgui/src/cap_qtkit.mm
@@ -338,11 +338,10 @@ int CvCaptureCAM::startCaptureDevice(int cameraNum) {
 	}
 	if (cameraNum >= 0) {
-		camNum = cameraNum % [devices count]; 
+		int nCameras = [devices count];
-		if (camNum != cameraNum) {
+        if( cameraNum < 0 || cameraNum >= nCameras )
-			cout << "Warning: Max Camera Num is " << [devices count]-1 << "; Using camera " << camNum << endl; 
+            return 0;
-		}
+		device = [devices objectAtIndex:cameraNum] ;
-		device = [devices objectAtIndex:camNum] ;
 	} else {
 		device = [QTCaptureDevice defaultInputDeviceWithMediaType:QTMediaTypeVideo]  ;
 	}