Skip to content

O
opencv
Commit 5a706eee authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files
Options

Merge pull request #11578 from alalek:build_warnings

parents 9b173d31 39b60f9b
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
modules/videoio/src/cap_openni.cpp
View file @ 5a706eee
...@@ -244,26 +244,26 @@ private: ...@@ -244,26 +244,26 @@ private:
ApproximateSynchronizerBase(_approxSyncGrabber) ApproximateSynchronizerBase(_approxSyncGrabber)
{} {}
virtual bool isSpinContinue() const virtual bool isSpinContinue() const CV_OVERRIDE
{ {
int maxBufferSize = approxSyncGrabber.getMaxBufferSize(); int maxBufferSize = approxSyncGrabber.getMaxBufferSize();
return (maxBufferSize <= 0) || (static_cast<int>(depthQueue.size()) < maxBufferSize && return (maxBufferSize <= 0) || (static_cast<int>(depthQueue.size()) < maxBufferSize &&
static_cast<int>(imageQueue.size()) < maxBufferSize); // "<" to may push static_cast<int>(imageQueue.size()) < maxBufferSize); // "<" to may push
} }
virtual inline void pushDepthMetaData( xn::DepthMetaData& depthMetaData ) virtual inline void pushDepthMetaData( xn::DepthMetaData& depthMetaData ) CV_OVERRIDE
{ {
cv::Ptr<xn::DepthMetaData> depthPtr = cv::makePtr<xn::DepthMetaData>(); cv::Ptr<xn::DepthMetaData> depthPtr = cv::makePtr<xn::DepthMetaData>();
depthPtr->CopyFrom(depthMetaData); depthPtr->CopyFrom(depthMetaData);
depthQueue.push(depthPtr); depthQueue.push(depthPtr);
} }
virtual inline void pushImageMetaData( xn::ImageMetaData& imageMetaData ) virtual inline void pushImageMetaData( xn::ImageMetaData& imageMetaData ) CV_OVERRIDE
{ {
cv::Ptr<xn::ImageMetaData> imagePtr = cv::makePtr<xn::ImageMetaData>(); cv::Ptr<xn::ImageMetaData> imagePtr = cv::makePtr<xn::ImageMetaData>();
imagePtr->CopyFrom(imageMetaData); imagePtr->CopyFrom(imageMetaData);
imageQueue.push(imagePtr); imageQueue.push(imagePtr);
} }
virtual inline bool popDepthMetaData( xn::DepthMetaData& depthMetaData ) virtual inline bool popDepthMetaData( xn::DepthMetaData& depthMetaData ) CV_OVERRIDE
{ {
if( depthQueue.empty() ) if( depthQueue.empty() )
return false; return false;
...@@ -272,7 +272,7 @@ private: ...@@ -272,7 +272,7 @@ private:
depthQueue.pop(); depthQueue.pop();
return true; return true;
} }
virtual inline bool popImageMetaData( xn::ImageMetaData& imageMetaData ) virtual inline bool popImageMetaData( xn::ImageMetaData& imageMetaData ) CV_OVERRIDE
{ {
if( imageQueue.empty() ) if( imageQueue.empty() )
return false; return false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment