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

Normalize line endings and whitespace

Browse Source
This commit is contained in:
OpenCV Buildbot
2012-10-17 03:18:30 +04:00
committed by Andrey Kamaev
parent 69020da607
commit 04384a71e4
1516 changed files with 258846 additions and 258162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/highgui/src/cap_mil.cpp
View File

@@ -73,7 +73,7 @@ public:
virtual bool setProperty(int, double) { return false; }
virtual bool grabFrame();
virtual IplImage* retrieveFrame(int);
virtual int getCaptureDomain() { return CV_CAP_MIL; } // Return the type of the capture object: CV_CAP_VFW, etc...
virtual int getCaptureDomain() { return CV_CAP_MIL; } // Return the type of the capture object: CV_CAP_VFW, etc...
protected:
void init();
@@ -193,10 +193,10 @@ double CvCaptureCAM_MIL::getProperty( int property_id )
{
switch( property_id )
{
case CV_CAP_PROP_FRAME_WIDTH:
case CV_CAP_PROP_FRAME_WIDTH:
return rgb_frame ? rgb_frame->width : 0;
case CV_CAP_PROP_FRAME_HEIGHT:
return rgb_frame ? rgb_frame->height : 0;
case CV_CAP_PROP_FRAME_HEIGHT:
return rgb_frame ? rgb_frame->height : 0;
}
return 0;
}
@@ -209,7 +209,7 @@ bool CvCaptureCAM_MIL::setProperty( int, double )
CvCapture* cvCreateCameraCapture_MIL( int index )
{
CvCaptureCAM_MIL* capture = new CvCaptureCAM_MIL;
CvCaptureCAM_MIL* capture = new CvCaptureCAM_MIL;
if( capture->open( index ))
return capture;