generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Vadim Pisarevsky 2011-05-21 18:07:28 +00:00
parent 9170ff6f5e
commit b58d9edc6a
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/highgui/src/cap_qtkit.mm
View File

@ -338,11 +338,10 @@ int CvCaptureCAM::startCaptureDevice(int cameraNum) {
} }
if (cameraNum >= 0) { 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 { } else {
device = [QTCaptureDevice defaultInputDeviceWithMediaType:QTMediaTypeVideo] ; device = [QTCaptureDevice defaultInputDeviceWithMediaType:QTMediaTypeVideo] ;
} }