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

renamed property of openni camera

Browse Source
This commit is contained in:
Maria Dimashova
2012-03-16 09:08:18 +00:00
parent cf9a822aba
commit 00aca7e77a
4 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
modules/highgui/src/cap_openni.cpp
View File

@@ -127,13 +127,13 @@ protected:
// OpenNI context
xn::Context context;
bool m_isOpened;
bool m_isImageGeneratorPresent;
// Data generators with its metadata
xn::DepthGenerator depthGenerator;
xn::DepthMetaData depthMetaData;
XnMapOutputMode depthOutputMode;
bool m_isImageGeneratorPresent;
xn::ImageGenerator imageGenerator;
xn::ImageMetaData imageMetaData;
XnMapOutputMode imageOutputMode;
@@ -177,6 +177,7 @@ CvCapture_OpenNI::CvCapture_OpenNI( int index )
depthOutputMode.nFPS = imageOutputMode.nFPS = 30;
m_isOpened = false;
m_isImageGeneratorPresent = false;
// Initialize and configure the context.
if( context.Init() == XN_STATUS_OK )
@@ -246,13 +247,9 @@ CvCapture_OpenNI::CvCapture_OpenNI( int index )
return;
}
if(Imagelist.IsEmpty())
if( !Imagelist.IsEmpty() )
{
m_isImageGeneratorPresent = FALSE;
}
else
{
m_isImageGeneratorPresent = TRUE;
m_isImageGeneratorPresent = true;
imageGenerator.Create( context );
if( status != XN_STATUS_OK )
{
@@ -264,7 +261,7 @@ CvCapture_OpenNI::CvCapture_OpenNI( int index )
// Set map output mode.
CV_Assert( depthGenerator.SetMapOutputMode( depthOutputMode ) == XN_STATUS_OK ); // xn::DepthGenerator supports VGA only! (Jan 2011)
CV_Assert( m_isImageGeneratorPresent ? ( imageGenerator.SetMapOutputMode( imageOutputMode ) == XN_STATUS_OK ) : TRUE );
CV_Assert( m_isImageGeneratorPresent ? ( imageGenerator.SetMapOutputMode( imageOutputMode ) == XN_STATUS_OK ) : true );
// Start generating data.
status = context.StartGeneratingAll();
@@ -483,7 +480,7 @@ double CvCapture_OpenNI::getImageGeneratorProperty( int propIdx )
if( !m_isImageGeneratorPresent )
return propValue;
if( propIdx == CV_CAP_PROP_IMAGE_GENERATOR_PRESENT )
if( propIdx == CV_CAP_PROP_OPENNI_IMAGE_GENERATOR_PRESENT )
propValue = m_isImageGeneratorPresent ? 1. : 0.;
else
{