|
|
|
@ -229,14 +229,14 @@ void CvCaptureCAM_XIMEA::resetCvImage() |
|
|
|
|
switch( image.frm) |
|
|
|
|
{ |
|
|
|
|
case XI_MONO8 : |
|
|
|
|
case XI_RAW8 :
|
|
|
|
|
case XI_RAW8 : |
|
|
|
|
{ |
|
|
|
|
if(frame->depth != IPL_DEPTH_8U || frame->nChannels != 1) |
|
|
|
|
do_reset = true; |
|
|
|
|
} |
|
|
|
|
break; |
|
|
|
|
case XI_MONO16 : |
|
|
|
|
case XI_RAW16 :
|
|
|
|
|
case XI_RAW16 : |
|
|
|
|
{ |
|
|
|
|
if(frame->depth != IPL_DEPTH_16U || frame->nChannels != 1) |
|
|
|
|
do_reset = true; |
|
|
|
@ -332,7 +332,6 @@ bool CvCaptureCAM_XIMEA::setProperty( int property_id, double value ) |
|
|
|
|
case CV_CAP_PROP_XI_TIMEOUT: |
|
|
|
|
timeout = (int) value; |
|
|
|
|
return true; |
|
|
|
|
|
|
|
|
|
case CV_CAP_PROP_XI_EXPOSURE: |
|
|
|
|
ximea_param = "exposure"; |
|
|
|
|
value_type = xiTypeInteger; |
|
|
|
@ -986,7 +985,6 @@ double CvCaptureCAM_XIMEA::getProperty( int property_id ) |
|
|
|
|
{ |
|
|
|
|
case CV_CAP_PROP_XI_TIMEOUT: |
|
|
|
|
return (double) timeout; |
|
|
|
|
|
|
|
|
|
case CV_CAP_PROP_XI_EXPOSURE: |
|
|
|
|
ximea_param = "exposure"; |
|
|
|
|
value_type = xiTypeInteger; |
|
|
|
@ -1671,4 +1669,3 @@ void CvCaptureCAM_XIMEA::errMsg(const char* msg, int errNum) |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/**********************************************************************************/ |
|
|
|
|
|