提交 5357e28a 编写于 作者: S Sean McBride

Removed some extra semi-colons

Fixes clang -Wextra-semi warnings.
上级 ab3814f9
...@@ -495,8 +495,8 @@ void Mat::forEach_impl(const Functor& operation) { ...@@ -495,8 +495,8 @@ void Mat::forEach_impl(const Functor& operation) {
{ {
public: public:
PixelOperationWrapper(Mat_<_Tp>* const frame, const Functor& _operation) PixelOperationWrapper(Mat_<_Tp>* const frame, const Functor& _operation)
: mat(frame), op(_operation) {}; : mat(frame), op(_operation) {}
virtual ~PixelOperationWrapper(){}; virtual ~PixelOperationWrapper(){}
// ! Overloaded virtual operator // ! Overloaded virtual operator
// convert range call to row call. // convert range call to row call.
virtual void operator()(const Range &range) const { virtual void operator()(const Range &range) const {
...@@ -525,7 +525,7 @@ void Mat::forEach_impl(const Functor& operation) { ...@@ -525,7 +525,7 @@ void Mat::forEach_impl(const Functor& operation) {
this->rowCall(&idx[0], COLS, DIMS); this->rowCall(&idx[0], COLS, DIMS);
} }
} }
}; }
private: private:
Mat_<_Tp>* const mat; Mat_<_Tp>* const mat;
const Functor op; const Functor op;
...@@ -562,12 +562,12 @@ void Mat::forEach_impl(const Functor& operation) { ...@@ -562,12 +562,12 @@ void Mat::forEach_impl(const Functor& operation) {
op(*pixel++, static_cast<const int*>(idx)); op(*pixel++, static_cast<const int*>(idx));
idx[1]++; idx[1]++;
} }
}; }
PixelOperationWrapper& operator=(const PixelOperationWrapper &) { PixelOperationWrapper& operator=(const PixelOperationWrapper &) {
CV_Assert(false); CV_Assert(false);
// We can not remove this implementation because Visual Studio warning C4822. // We can not remove this implementation because Visual Studio warning C4822.
return *this; return *this;
}; }
}; };
parallel_for_(cv::Range(0, LINES), PixelOperationWrapper(reinterpret_cast<Mat_<_Tp>*>(this), operation)); parallel_for_(cv::Range(0, LINES), PixelOperationWrapper(reinterpret_cast<Mat_<_Tp>*>(this), operation));
...@@ -650,8 +650,8 @@ private: ...@@ -650,8 +650,8 @@ private:
virtual void deleteDataInstance(void* pData) const {delete (T*)pData;} // Wrapper to release data by template virtual void deleteDataInstance(void* pData) const {delete (T*)pData;} // Wrapper to release data by template
// Disable TLS copy operations // Disable TLS copy operations
TLSData(TLSData &) {}; TLSData(TLSData &) {}
TLSData& operator =(const TLSData &) {return *this;}; TLSData& operator =(const TLSData &) {return *this;}
}; };
/** @brief Designed for command line parsing /** @brief Designed for command line parsing
......
...@@ -319,7 +319,7 @@ CV_INLINE void ...@@ -319,7 +319,7 @@ CV_INLINE void
{ {
m_nNextShortUpdate[pixel] = (uchar)( rand() % m_nShortUpdate ); m_nNextShortUpdate[pixel] = (uchar)( rand() % m_nShortUpdate );
}; };
}; }
CV_INLINE int CV_INLINE int
_cvCheckPixelBackgroundNP(long pixel, _cvCheckPixelBackgroundNP(long pixel,
...@@ -436,7 +436,7 @@ CV_INLINE int ...@@ -436,7 +436,7 @@ CV_INLINE int
}; };
} }
return 0; return 0;
}; }
CV_INLINE void CV_INLINE void
icvUpdatePixelBackgroundNP(const Mat& _src, Mat& _dst, icvUpdatePixelBackgroundNP(const Mat& _src, Mat& _dst,
...@@ -554,7 +554,7 @@ CV_INLINE void ...@@ -554,7 +554,7 @@ CV_INLINE void
i++; i++;
} }
} }
}; }
......
...@@ -192,6 +192,6 @@ namespace cv ...@@ -192,6 +192,6 @@ namespace cv
Ptr<IVideoCapture> createGPhoto2Capture(int index); Ptr<IVideoCapture> createGPhoto2Capture(int index);
Ptr<IVideoCapture> createGPhoto2Capture(const String& deviceName); Ptr<IVideoCapture> createGPhoto2Capture(const String& deviceName);
}; }
#endif /* __VIDEOIO_H_ */ #endif /* __VIDEOIO_H_ */
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册