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

Merge pull request #5156 from brunomorishita:fix_build

Browse Source
This commit is contained in:
Alexander Alekhin 2015-08-14 13:56:45 +00:00
commit e866680d96
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/videoio/src/cap.cpp
View File

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

2
modules/videoio/src/cap_openni2.cpp
View File

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

1
modules/videoio/src/precomp.hpp
View File

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