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

another fix for cap_dshow.cpp; fixed warning in facerec_demo

Browse Source
This commit is contained in:
Vadim Pisarevsky 2012-03-30 20:06:06 +00:00
parent 3a564d1ae8
commit f309bafe9e
3 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/highgui/include/opencv2/highgui/highgui_c.h
View File

@ -370,6 +370,13 @@ enum
CV_CAP_PROP_GUID =29, CV_CAP_PROP_GUID =29,
CV_CAP_PROP_ISO_SPEED =30, CV_CAP_PROP_ISO_SPEED =30,
CV_CAP_PROP_MAX_DC1394 =31, CV_CAP_PROP_MAX_DC1394 =31,
CV_CAP_PROP_BACKLIGHT =32,
CV_CAP_PROP_PAN =33,
CV_CAP_PROP_TILT =34,
CV_CAP_PROP_ROLL =35,
CV_CAP_PROP_IRIS =36,
CV_CAP_PROP_SETTINGS =37,
CV_CAP_PROP_AUTOGRAB =1024, // property for highgui class CvCapture_Android only CV_CAP_PROP_AUTOGRAB =1024, // property for highgui class CvCapture_Android only
CV_CAP_PROP_SUPPORTED_PREVIEW_SIZES_STRING=1025, // readonly, tricky property, returns cpnst char* indeed CV_CAP_PROP_SUPPORTED_PREVIEW_SIZES_STRING=1025, // readonly, tricky property, returns cpnst char* indeed
CV_CAP_PROP_PREVIEW_FORMAT=1026, // readonly, tricky property, returns cpnst char* indeed CV_CAP_PROP_PREVIEW_FORMAT=1026, // readonly, tricky property, returns cpnst char* indeed

34
modules/highgui/src/cap_dshow.cpp
View File

@ -2183,7 +2183,7 @@ int videoInput::getFourccFromMediaSubtype(GUID type) {
GUID *videoInput::getMediaSubtypeFromFourcc(int fourcc){ GUID *videoInput::getMediaSubtypeFromFourcc(int fourcc){
for (int i=0;i<VI_NUM_TYPES;i++) { for (int i=0;i<VI_NUM_TYPES;i++) {
if ( fourcc == mediaSubtypes[i].Data1 ) { if ( (unsigned long)fourcc == mediaSubtypes[i].Data1 ) {
return &mediaSubtypes[i]; return &mediaSubtypes[i];
} }
} }
@ -2191,18 +2191,6 @@ GUID *videoInput::getMediaSubtypeFromFourcc(int fourcc){
return NULL; return NULL;
} }
// need to add to highgui_c.h
enum { CV_CAP_PROP_SETTINGS = 28,
CV_CAP_PROP_BACKLIGHT,
CV_CAP_PROP_PAN,
CV_CAP_PROP_TILT,
CV_CAP_PROP_ROLL,
CV_CAP_PROP_ZOOM_DSHOW,
CV_CAP_PROP_IRIS,
CV_CAP_PROP_FOCUS_DSHOW
};
void videoInput::getVideoPropertyAsString(int prop, char * propertyAsString){ void videoInput::getVideoPropertyAsString(int prop, char * propertyAsString){
@ -2273,7 +2261,7 @@ int videoInput::getCameraPropertyFromCV(int cv_property){
case CV_CAP_PROP_ROLL: case CV_CAP_PROP_ROLL:
return CameraControl_Roll; return CameraControl_Roll;
case CV_CAP_PROP_ZOOM_DSHOW: case CV_CAP_PROP_ZOOM:
return CameraControl_Zoom; return CameraControl_Zoom;
case CV_CAP_PROP_EXPOSURE: case CV_CAP_PROP_EXPOSURE:
@ -2282,7 +2270,7 @@ int videoInput::getCameraPropertyFromCV(int cv_property){
case CV_CAP_PROP_IRIS: case CV_CAP_PROP_IRIS:
return CameraControl_Iris; return CameraControl_Iris;
case CV_CAP_PROP_FOCUS_DSHOW: case CV_CAP_PROP_FOCUS:
return CameraControl_Focus; return CameraControl_Focus;
} }
return -1; return -1;
@ -3272,14 +3260,14 @@ double CvCaptureCAM_DShow::getProperty( int property_id )
case CV_CAP_PROP_ROLL: case CV_CAP_PROP_ROLL:
if (VI.getVideoSettingCamera(index,VI.getCameraPropertyFromCV(CV_CAP_PROP_ROLL),min_value,max_value,stepping_delta,current_value,flags,defaultValue) ) return (double)current_value; if (VI.getVideoSettingCamera(index,VI.getCameraPropertyFromCV(CV_CAP_PROP_ROLL),min_value,max_value,stepping_delta,current_value,flags,defaultValue) ) return (double)current_value;
case CV_CAP_PROP_ZOOM_DSHOW: case CV_CAP_PROP_ZOOM:
if (VI.getVideoSettingCamera(index,VI.getCameraPropertyFromCV(CV_CAP_PROP_BACKLIGHT),min_value,max_value,stepping_delta,current_value,flags,defaultValue) ) return (double)current_value; if (VI.getVideoSettingCamera(index,VI.getCameraPropertyFromCV(CV_CAP_PROP_BACKLIGHT),min_value,max_value,stepping_delta,current_value,flags,defaultValue) ) return (double)current_value;
case CV_CAP_PROP_IRIS: case CV_CAP_PROP_IRIS:
if (VI.getVideoSettingCamera(index,VI.getCameraPropertyFromCV(CV_CAP_PROP_IRIS),min_value,max_value,stepping_delta,current_value,flags,defaultValue) ) return (double)current_value; if (VI.getVideoSettingCamera(index,VI.getCameraPropertyFromCV(CV_CAP_PROP_IRIS),min_value,max_value,stepping_delta,current_value,flags,defaultValue) ) return (double)current_value;
case CV_CAP_PROP_FOCUS_DSHOW: case CV_CAP_PROP_FOCUS:
if (VI.getVideoSettingCamera(index,VI.getCameraPropertyFromCV(CV_CAP_PROP_FOCUS_DSHOW),min_value,max_value,stepping_delta,current_value,flags,defaultValue) ) return (double)current_value; if (VI.getVideoSettingCamera(index,VI.getCameraPropertyFromCV(CV_CAP_PROP_FOCUS),min_value,max_value,stepping_delta,current_value,flags,defaultValue) ) return (double)current_value;
} }
@ -3314,7 +3302,7 @@ bool CvCaptureCAM_DShow::setProperty( int property_id, double value )
break; break;
case CV_CAP_PROP_FPS: case CV_CAP_PROP_FPS:
VI.setIdealFramerate(index,value); VI.setIdealFramerate(index,cvRound(value));
handled = true; handled = true;
break; break;
@ -3391,8 +3379,8 @@ bool CvCaptureCAM_DShow::setProperty( int property_id, double value )
case CV_CAP_PROP_ROLL: case CV_CAP_PROP_ROLL:
return VI.setVideoSettingCamera(index,VI.getCameraPropertyFromCV(CV_CAP_PROP_ROLL),(long)value); return VI.setVideoSettingCamera(index,VI.getCameraPropertyFromCV(CV_CAP_PROP_ROLL),(long)value);
case CV_CAP_PROP_ZOOM_DSHOW: case CV_CAP_PROP_ZOOM:
return VI.setVideoSettingCamera(index,VI.getCameraPropertyFromCV(CV_CAP_PROP_ZOOM_DSHOW),(long)value); return VI.setVideoSettingCamera(index,VI.getCameraPropertyFromCV(CV_CAP_PROP_ZOOM),(long)value);
case CV_CAP_PROP_EXPOSURE: case CV_CAP_PROP_EXPOSURE:
return VI.setVideoSettingCamera(index,VI.getCameraPropertyFromCV(CV_CAP_PROP_EXPOSURE),(long)value); return VI.setVideoSettingCamera(index,VI.getCameraPropertyFromCV(CV_CAP_PROP_EXPOSURE),(long)value);
@ -3400,8 +3388,8 @@ bool CvCaptureCAM_DShow::setProperty( int property_id, double value )
case CV_CAP_PROP_IRIS: case CV_CAP_PROP_IRIS:
return VI.setVideoSettingCamera(index,VI.getCameraPropertyFromCV(CV_CAP_PROP_IRIS),(long)value); return VI.setVideoSettingCamera(index,VI.getCameraPropertyFromCV(CV_CAP_PROP_IRIS),(long)value);
case CV_CAP_PROP_FOCUS_DSHOW: case CV_CAP_PROP_FOCUS:
return VI.setVideoSettingCamera(index,VI.getCameraPropertyFromCV(CV_CAP_PROP_FOCUS_DSHOW),(long)value); return VI.setVideoSettingCamera(index,VI.getCameraPropertyFromCV(CV_CAP_PROP_FOCUS),(long)value);
} }

2
samples/cpp/facerec_demo.cpp
View File

@ -53,7 +53,7 @@ int main(int argc, const char *argv[]) {
// read in the data // read in the data
try { try {
read_csv(fn_csv, images, labels); read_csv(fn_csv, images, labels);
} catch (exception& e) { } catch (exception&) {
cerr << "Error opening file \"" << fn_csv << "\"." << endl; cerr << "Error opening file \"" << fn_csv << "\"." << endl;
exit(1); exit(1);
} }