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

Removed whitespaces reported by buildbot.

Browse Source
This commit is contained in:
Marian Zajko 2015-11-09 13:30:08 +01:00
parent 352b121202
commit 2998248dd3
1 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/videoio/src/cap_ximea.cpp
View File

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