diff --git a/modules/core/include/opencv2/core/utility.hpp b/modules/core/include/opencv2/core/utility.hpp index e465faee5ff59a494af207e7843975d5fde6e324..01f5c7664a5a7883f4e8d5bdb5113fb264cdc605 100644 --- a/modules/core/include/opencv2/core/utility.hpp +++ b/modules/core/include/opencv2/core/utility.hpp @@ -495,8 +495,8 @@ void Mat::forEach_impl(const Functor& operation) { { public: PixelOperationWrapper(Mat_<_Tp>* const frame, const Functor& _operation) - : mat(frame), op(_operation) {}; - virtual ~PixelOperationWrapper(){}; + : mat(frame), op(_operation) {} + virtual ~PixelOperationWrapper(){} // ! Overloaded virtual operator // convert range call to row call. virtual void operator()(const Range &range) const { @@ -525,7 +525,7 @@ void Mat::forEach_impl(const Functor& operation) { this->rowCall(&idx[0], COLS, DIMS); } } - }; + } private: Mat_<_Tp>* const mat; const Functor op; @@ -562,12 +562,12 @@ void Mat::forEach_impl(const Functor& operation) { op(*pixel++, static_cast(idx)); idx[1]++; } - }; + } PixelOperationWrapper& operator=(const PixelOperationWrapper &) { CV_Assert(false); // We can not remove this implementation because Visual Studio warning C4822. return *this; - }; + } }; parallel_for_(cv::Range(0, LINES), PixelOperationWrapper(reinterpret_cast*>(this), operation)); @@ -650,8 +650,8 @@ private: virtual void deleteDataInstance(void* pData) const {delete (T*)pData;} // Wrapper to release data by template // Disable TLS copy operations - TLSData(TLSData &) {}; - TLSData& operator =(const TLSData &) {return *this;}; + TLSData(TLSData &) {} + TLSData& operator =(const TLSData &) {return *this;} }; /** @brief Designed for command line parsing diff --git a/modules/video/src/bgfg_KNN.cpp b/modules/video/src/bgfg_KNN.cpp index 8c92d77acd427cea9b7339040b47db8e993b4723..66be34a00f12b784ff820a7e0fe1598dfb126da0 100755 --- a/modules/video/src/bgfg_KNN.cpp +++ b/modules/video/src/bgfg_KNN.cpp @@ -319,7 +319,7 @@ CV_INLINE void { m_nNextShortUpdate[pixel] = (uchar)( rand() % m_nShortUpdate ); }; -}; +} CV_INLINE int _cvCheckPixelBackgroundNP(long pixel, @@ -436,7 +436,7 @@ CV_INLINE int }; } return 0; -}; +} CV_INLINE void icvUpdatePixelBackgroundNP(const Mat& _src, Mat& _dst, @@ -554,7 +554,7 @@ CV_INLINE void i++; } } -}; +} diff --git a/modules/videoio/src/precomp.hpp b/modules/videoio/src/precomp.hpp index 517dc9186b7318933cf13f15b879d5c2b81d6017..cb3a775dc9a9727a229a8d2b84d716977572ba0b 100644 --- a/modules/videoio/src/precomp.hpp +++ b/modules/videoio/src/precomp.hpp @@ -192,6 +192,6 @@ namespace cv Ptr createGPhoto2Capture(int index); Ptr createGPhoto2Capture(const String& deviceName); -}; +} #endif /* __VIDEOIO_H_ */