fix build error when both OpenNI and OpenNI2 are supported (issue 4918)

This commit is contained in:
Bruno Goncalves 2015-08-09 00:42:48 -03:00
parent 9b2a7fe723
commit 894c2468df
3 changed files with 3 additions and 2 deletions

View File

@ -231,7 +231,7 @@ CV_IMPL CvCapture * cvCreateCameraCapture (int index)
#ifdef HAVE_OPENNI2
case CV_CAP_OPENNI2:
if (!capture)
capture = cvCreateCameraCapture_OpenNI(index);
capture = cvCreateCameraCapture_OpenNI2(index);
if (pref) break;
#endif

View File

@ -903,7 +903,7 @@ IplImage* CvCapture_OpenNI2::retrieveFrame( int outputType )
return image;
}
CvCapture* cvCreateCameraCapture_OpenNI( int index )
CvCapture* cvCreateCameraCapture_OpenNI2( int index )
{
CvCapture_OpenNI2* capture = new CvCapture_OpenNI2( index );

View File

@ -120,6 +120,7 @@ CvCapture* cvCreateFileCapture_MSMF (const char* filename);
CvVideoWriter* cvCreateVideoWriter_MSMF( const char* filename, int fourcc,
double fps, CvSize frameSize, int is_color );
CvCapture* cvCreateCameraCapture_OpenNI( int index );
CvCapture* cvCreateCameraCapture_OpenNI2( int index );
CvCapture* cvCreateFileCapture_OpenNI( const char* filename );
CvCapture* cvCreateCameraCapture_Android( int index );
CvCapture* cvCreateCameraCapture_XIMEA( int index );