mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-07-26 07:07:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7291 from lr-morales:openni/7290-openni1_2_conflict

Browse Source
This commit is contained in:
Alexander Alekhin 2016-09-15 17:10:20 +00:00
commit aac745c8e4
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -340,6 +340,12 @@ CV_IMPL CvCapture * cvCreateFileCaptureWithPreference (const char * filename, in
if (apiPreference) break; if (apiPreference) break;
#endif #endif
#ifdef HAVE_OPENNI2
case CV_CAP_OPENNI2:
TRY_OPEN(result, cvCreateFileCapture_OpenNI2 (filename))
if (apiPreference) break;
#endif
case CV_CAP_IMAGES: case CV_CAP_IMAGES:
TRY_OPEN(result, cvCreateFileCapture_Images (filename)) TRY_OPEN(result, cvCreateFileCapture_Images (filename))
} }

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

@ -1086,7 +1086,7 @@ CvCapture* cvCreateCameraCapture_OpenNI2( int index )
return 0; return 0;
} }
CvCapture* cvCreateFileCapture_OpenNI( const char* filename ) CvCapture* cvCreateFileCapture_OpenNI2( const char* filename )
{ {
CvCapture_OpenNI2* capture = new CvCapture_OpenNI2( filename ); CvCapture_OpenNI2* capture = new CvCapture_OpenNI2( filename );

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

@ -124,6 +124,7 @@ CvVideoWriter* cvCreateVideoWriter_MSMF( const char* filename, int fourcc,
CvCapture* cvCreateCameraCapture_OpenNI( int index ); CvCapture* cvCreateCameraCapture_OpenNI( int index );
CvCapture* cvCreateCameraCapture_OpenNI2( int index ); CvCapture* cvCreateCameraCapture_OpenNI2( int index );
CvCapture* cvCreateFileCapture_OpenNI( const char* filename ); CvCapture* cvCreateFileCapture_OpenNI( const char* filename );
CvCapture* cvCreateFileCapture_OpenNI2( const char* filename );
CvCapture* cvCreateCameraCapture_Android( int index ); CvCapture* cvCreateCameraCapture_Android( int index );
CvCapture* cvCreateCameraCapture_XIMEA( int index ); CvCapture* cvCreateCameraCapture_XIMEA( int index );
CvCapture* cvCreateCameraCapture_AVFoundation(int index); CvCapture* cvCreateCameraCapture_AVFoundation(int index);