diff --git a/modules/core/include/opencv2/core/mat.hpp b/modules/core/include/opencv2/core/mat.hpp index 4cb12cccc1..8ddc16eb1d 100644 --- a/modules/core/include/opencv2/core/mat.hpp +++ b/modules/core/include/opencv2/core/mat.hpp @@ -1075,7 +1075,9 @@ template template inline Mat_<_Tp>::operator Vec template inline Mat_<_Tp>::operator Matx::channel_type, m, n>() const { CV_Assert(n % DataType<_Tp>::channels == 0); - return this->Mat::operator Matx::channel_type, m, n>(); + + Matx::channel_type, m, n> res = this->Mat::operator Matx::channel_type, m, n>(); + return res; } template inline void diff --git a/modules/highgui/src/cap_openni.cpp b/modules/highgui/src/cap_openni.cpp index 51877128a3..402a0cd59f 100644 --- a/modules/highgui/src/cap_openni.cpp +++ b/modules/highgui/src/cap_openni.cpp @@ -172,6 +172,9 @@ public: xn::ImageGenerator &imageGenerator; private: + ApproximateSyncGrabber(const ApproximateSyncGrabber&); + ApproximateSyncGrabber& operator=(ApproximateSyncGrabber&); + int maxBufferSize; bool isCircleBuffer; int maxTimeDuration; @@ -215,7 +218,7 @@ private: virtual bool grab( xn::DepthMetaData& depthMetaData, xn::ImageMetaData& imageMetaData ) { - while(1) + for(;;) { if( !isDepthFilled ) isDepthFilled = popDepthMetaData(depth); @@ -971,7 +974,7 @@ double CvCapture_OpenNI::getDepthGeneratorProperty( int propIdx ) propValue = depthGenerator.GetAlternativeViewPointCap().IsViewPointAs(imageGenerator) ? 1.0 : 0.0; break; case CV_CAP_PROP_POS_MSEC : - propValue = depthGenerator.GetTimestamp(); + propValue = (double)depthGenerator.GetTimestamp(); break; case CV_CAP_PROP_POS_FRAMES : propValue = depthGenerator.GetFrameID(); @@ -1067,10 +1070,10 @@ double CvCapture_OpenNI::getImageGeneratorProperty( int propIdx ) propValue = mode.nFPS; break; case CV_CAP_PROP_POS_MSEC : - propValue = imageGenerator.GetTimestamp(); + propValue = (double)imageGenerator.GetTimestamp(); break; case CV_CAP_PROP_POS_FRAMES : - propValue = imageGenerator.GetFrameID(); + propValue = (double)imageGenerator.GetFrameID(); break; default : {