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

Added PVAPI enums to highgui.hpp

Browse Source 
Added "PVAPI_" prefix to FrameStartTriggerMode definition
This commit is contained in:
Nick D'Ademo
2014-01-14 21:38:57 +11:00
parent 3cf5c0b991
commit 25870fa66b
3 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/highgui/src/cap_pvapi.cpp
View File

@@ -285,7 +285,7 @@ double CvCaptureCAM_PvAPI::getProperty( int property_id )
case CV_CAP_PROP_GAIN:
PvAttrUint32Get(Camera.Handle, "GainValue", &nTemp);
return (double)nTemp;
case CV_CAP_PROP_FRAMESTARTTRIGGERMODE:
case CV_CAP_PROP_PVAPI_FRAMESTARTTRIGGERMODE:
char triggerMode[256];
PvAttrEnumGet(Camera.Handle, "FrameStartTriggerMode", triggerMode, 256, NULL);
if (strcmp(triggerMode, "Freerun")==0)
@@ -388,7 +388,7 @@ bool CvCaptureCAM_PvAPI::setProperty( int property_id, double value )
return false;
}
break;
case CV_CAP_PROP_FRAMESTARTTRIGGERMODE:
case CV_CAP_PROP_PVAPI_FRAMESTARTTRIGGERMODE:
tPvErr error;
if (value==0)
error = PvAttrEnumSet(Camera.Handle, "FrameStartTriggerMode", "Freerun");