Chiebot-Mirror
/
opencv
mirror of https://github.com/opencv/opencv.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #11578 from alalek:build_warnings

Browse Source
pull/11583/head
Alexander Alekhin 7 years ago
parent 9b173d317f 39b60f9b17
commit 5a706eee8a
1 changed files with 5 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      modules/videoio/src/cap_openni.cpp

10
modules/videoio/src/cap_openni.cpp
Unescape View File

@ -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:
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;

Write Preview
Loading…
Cancel
Save