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

fixed compilation error and some warnings if with_openni is true

Browse Source
This commit is contained in:
Maria Dimashova 2012-06-13 08:38:30 +00:00
parent 7b544d2a6d
commit f363c835ab
1 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -99,12 +99,12 @@ const std::string XMLConfig =
class ApproximateSyncGrabber class ApproximateSyncGrabber
{ {
public: public:
ApproximateSyncGrabber( xn::Context &context, ApproximateSyncGrabber( xn::Context &_context,
xn::DepthGenerator &depthGenerator, xn::DepthGenerator &_depthGenerator,
xn::ImageGenerator &imageGenerator, xn::ImageGenerator &_imageGenerator,
int maxBufferSize, bool isCircleBuffer, int maxTimeDuration ) : int _maxBufferSize, bool _isCircleBuffer, int _maxTimeDuration ) :
context(context), depthGenerator(depthGenerator), imageGenerator(imageGenerator), context(_context), depthGenerator(_depthGenerator), imageGenerator(_imageGenerator),
maxBufferSize(maxBufferSize), isCircleBuffer(isCircleBuffer), maxTimeDuration(maxTimeDuration) maxBufferSize(_maxBufferSize), isCircleBuffer(_isCircleBuffer), maxTimeDuration(_maxTimeDuration)
{ {
task = 0; task = 0;
@ -179,8 +179,8 @@ private:
class ApproximateSynchronizerBase class ApproximateSynchronizerBase
{ {
public: public:
ApproximateSynchronizerBase( ApproximateSyncGrabber& approxSyncGrabber ) : ApproximateSynchronizerBase( ApproximateSyncGrabber& _approxSyncGrabber ) :
approxSyncGrabber(approxSyncGrabber), isDepthFilled(false), isImageFilled(false) approxSyncGrabber(_approxSyncGrabber), isDepthFilled(false), isImageFilled(false)
{} {}
virtual ~ApproximateSynchronizerBase() {} virtual ~ApproximateSynchronizerBase() {}
@ -199,8 +199,8 @@ private:
if( status != XN_STATUS_OK ) if( status != XN_STATUS_OK )
continue; continue;
xn::DepthMetaData depth; //xn::DepthMetaData depth;
xn::ImageMetaData image; //xn::ImageMetaData image;
approxSyncGrabber.depthGenerator.GetMetaData(depth); approxSyncGrabber.depthGenerator.GetMetaData(depth);
approxSyncGrabber.imageGenerator.GetMetaData(image); approxSyncGrabber.imageGenerator.GetMetaData(image);
@ -258,8 +258,8 @@ private:
class ApproximateSynchronizer: public ApproximateSynchronizerBase class ApproximateSynchronizer: public ApproximateSynchronizerBase
{ {
public: public:
ApproximateSynchronizer( ApproximateSyncGrabber& approxSyncGrabber ) : ApproximateSynchronizer( ApproximateSyncGrabber& _approxSyncGrabber ) :
ApproximateSynchronizerBase(approxSyncGrabber) ApproximateSynchronizerBase(_approxSyncGrabber)
{} {}
virtual bool isSpinContinue() const virtual bool isSpinContinue() const
@ -461,6 +461,8 @@ protected:
static const int outputMapsTypesCount = 7; static const int outputMapsTypesCount = 7;
static XnMapOutputMode defaultMapOutputMode();
IplImage* retrieveDepthMap(); IplImage* retrieveDepthMap();
IplImage* retrievePointCloudMap(); IplImage* retrievePointCloudMap();
IplImage* retrieveDisparityMap(); IplImage* retrieveDisparityMap();
@ -524,15 +526,14 @@ bool CvCapture_OpenNI::isOpened() const
return isContextOpened; return isContextOpened;
} }
// static XnMapOutputMode defaultMapOutputMode() XnMapOutputMode CvCapture_OpenNI::defaultMapOutputMode()
// { {
// XnMapOutputMode mode; XnMapOutputMode mode;
// mode.nXRes = XN_VGA_X_RES; mode.nXRes = XN_VGA_X_RES;
// mode.nYRes = XN_VGA_Y_RES; mode.nYRes = XN_VGA_Y_RES;
// mode.nFPS = 30; mode.nFPS = 30;
// return mode; return mode;
// } }
CvCapture_OpenNI::CvCapture_OpenNI( int index ) CvCapture_OpenNI::CvCapture_OpenNI( int index )
{ {