[Issue #7290] Fixes OpenNI and OpenNI2 linking conflict

pull/7291/head
Luis Roberto Morales Iglesias 8 years ago
parent 32df09c275
commit 60b33046a7
No known key found for this signature in database
GPG Key ID: 76E922DD0343AB12
  1. 6
      modules/videoio/src/cap.cpp
  2. 2
      modules/videoio/src/cap_openni2.cpp
  3. 1
      modules/videoio/src/precomp.hpp

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

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

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

Loading…
Cancel
Save