diff --git a/modules/calib3d/src/chessboard.hpp b/modules/calib3d/src/chessboard.hpp index 4c862eca4c..f49b83572f 100644 --- a/modules/calib3d/src/chessboard.hpp +++ b/modules/calib3d/src/chessboard.hpp @@ -43,7 +43,7 @@ class FastX : public cv::Feature2D public: FastX(const Parameters &config = Parameters()); - virtual ~FastX(){}; + virtual ~FastX(){} void reconfigure(const Parameters ¶); @@ -74,8 +74,8 @@ class FastX : public cv::Feature2D std::vector > calcAngles(const std::vector &rotated_images, std::vector &keypoints)const; // define pure virtual methods - virtual int descriptorSize()const override{return 0;}; - virtual int descriptorType()const override{return 0;}; + virtual int descriptorSize()const override{return 0;} + virtual int descriptorType()const override{return 0;} virtual void operator()( cv::InputArray image, cv::InputArray mask, std::vector& keypoints, cv::OutputArray descriptors, bool useProvidedKeypoints=false )const { descriptors.clear(); @@ -620,10 +620,10 @@ class Chessboard: public cv::Feature2D */ void swap(Chessboard::Board &other); - bool operator==(const Chessboard::Board& other) const {return rows*cols == other.rows*other.cols;}; - bool operator< (const Chessboard::Board& other) const {return rows*cols < other.rows*other.cols;}; - bool operator> (const Chessboard::Board& other) const {return rows*cols > other.rows*other.cols;}; - bool operator>= (const cv::Size& size)const { return rows*cols >= size.width*size.height; }; + bool operator==(const Chessboard::Board& other) const {return rows*cols == other.rows*other.cols;} + bool operator< (const Chessboard::Board& other) const {return rows*cols < other.rows*other.cols;} + bool operator> (const Chessboard::Board& other) const {return rows*cols > other.rows*other.cols;} + bool operator>= (const cv::Size& size)const { return rows*cols >= size.width*size.height; } /** * \brief Returns a specific corner @@ -824,8 +824,8 @@ class Chessboard: public cv::Feature2D Chessboard::Board detectImpl(const cv::Mat& image,std::vector &feature_maps,const cv::Mat& mask)const; // define pure virtual methods - virtual int descriptorSize()const override{return 0;}; - virtual int descriptorType()const override{return 0;}; + virtual int descriptorSize()const override{return 0;} + virtual int descriptorType()const override{return 0;} virtual void operator()( cv::InputArray image, cv::InputArray mask, std::vector& keypoints, cv::OutputArray descriptors, bool useProvidedKeypoints=false )const { descriptors.clear(); diff --git a/modules/calib3d/src/usac/estimator.cpp b/modules/calib3d/src/usac/estimator.cpp index 75bc3cf5dd..c5b783b655 100644 --- a/modules/calib3d/src/usac/estimator.cpp +++ b/modules/calib3d/src/usac/estimator.cpp @@ -23,7 +23,7 @@ public: int estimateModelNonMinimalSample(const std::vector &sample, int sample_size, std::vector &models, const std::vector &weights) const override { return non_min_solver->estimate (sample, sample_size, models, weights); - }; + } int getMaxNumSolutions () const override { return min_solver->getMaxNumberOfSolutions(); } @@ -118,7 +118,7 @@ public: int estimateModelNonMinimalSample(const std::vector &sample, int sample_size, std::vector &models, const std::vector &weights) const override { return non_min_solver->estimate(sample, sample_size, models, weights); - }; + } int getMaxNumSolutions () const override { return min_solver->getMaxNumberOfSolutions(); } diff --git a/modules/core/include/opencv2/core/utils/trace.private.hpp b/modules/core/include/opencv2/core/utils/trace.private.hpp index afc41159f6..5a826b417b 100644 --- a/modules/core/include/opencv2/core/utils/trace.private.hpp +++ b/modules/core/include/opencv2/core/utils/trace.private.hpp @@ -63,7 +63,7 @@ class TraceMessage; class TraceStorage { public: TraceStorage() {} - virtual ~TraceStorage() {}; + virtual ~TraceStorage() {} virtual bool put(const TraceMessage& msg) const = 0; }; diff --git a/modules/core/src/parallel/registry_parallel.impl.hpp b/modules/core/src/parallel/registry_parallel.impl.hpp index c8b57e7d6c..2208748bb1 100644 --- a/modules/core/src/parallel/registry_parallel.impl.hpp +++ b/modules/core/src/parallel/registry_parallel.impl.hpp @@ -43,7 +43,7 @@ std::vector& getBuiltinParallelBackendsInfo() #endif }; return g_backends; -}; +} static bool sortByPriority(const ParallelBackendInfo &lhs, const ParallelBackendInfo &rhs) diff --git a/modules/features2d/src/fast.avx2.cpp b/modules/features2d/src/fast.avx2.cpp index ca0bcb9269..72e7d66924 100644 --- a/modules/features2d/src/fast.avx2.cpp +++ b/modules/features2d/src/fast.avx2.cpp @@ -165,7 +165,7 @@ public: _mm256_zeroupper(); } - virtual ~FAST_t_patternSize16_AVX2_Impl() CV_OVERRIDE {}; + virtual ~FAST_t_patternSize16_AVX2_Impl() CV_OVERRIDE {} private: int cols; diff --git a/modules/features2d/src/fast.hpp b/modules/features2d/src/fast.hpp index 6f750fea8d..1e221cbdf4 100644 --- a/modules/features2d/src/fast.hpp +++ b/modules/features2d/src/fast.hpp @@ -54,7 +54,7 @@ class FAST_t_patternSize16_AVX2 public: static Ptr getImpl(int _cols, int _threshold, bool _nonmax_suppression, const int* _pixel); virtual void process(int &j, const uchar* &ptr, uchar* curr, int* cornerpos, int &ncorners) = 0; - virtual ~FAST_t_patternSize16_AVX2() {}; + virtual ~FAST_t_patternSize16_AVX2() {} }; #endif } diff --git a/modules/imgcodecs/include/opencv2/imgcodecs.hpp b/modules/imgcodecs/include/opencv2/imgcodecs.hpp index cb4a170c28..18b04d5687 100644 --- a/modules/imgcodecs/include/opencv2/imgcodecs.hpp +++ b/modules/imgcodecs/include/opencv2/imgcodecs.hpp @@ -354,8 +354,8 @@ public: Mat* operator->(); iterator& operator++(); iterator operator++(int); - friend bool operator== (const iterator& a, const iterator& b) { return a.m_curr == b.m_curr; }; - friend bool operator!= (const iterator& a, const iterator& b) { return a.m_curr != b.m_curr; }; + friend bool operator== (const iterator& a, const iterator& b) { return a.m_curr == b.m_curr; } + friend bool operator!= (const iterator& a, const iterator& b) { return a.m_curr != b.m_curr; } private: ImageCollection* m_pCollection; diff --git a/modules/imgproc/src/filter.dispatch.cpp b/modules/imgproc/src/filter.dispatch.cpp index 097dd32055..53b8bb42c4 100644 --- a/modules/imgproc/src/filter.dispatch.cpp +++ b/modules/imgproc/src/filter.dispatch.cpp @@ -1401,7 +1401,7 @@ static void ocvSepFilter(int stype, int dtype, int ktype, Mat src(Size(width, height), stype, src_data, src_step); Mat dst(Size(width, height), dtype, dst_data, dst_step); f->apply(src, dst, Size(full_width, full_height), Point(offset_x, offset_y)); -}; +} //=================================================================== // HAL functions diff --git a/modules/imgproc/src/imgwarp.hpp b/modules/imgproc/src/imgwarp.hpp index 4b81b5e79d..35e9f7bb02 100644 --- a/modules/imgproc/src/imgwarp.hpp +++ b/modules/imgproc/src/imgwarp.hpp @@ -82,7 +82,7 @@ public: static Ptr getImpl(const double *M); virtual void processNN(const double *M, short* xy, double X0, double Y0, double W0, int bw) = 0; virtual void process(const double *M, short* xy, short* alpha, double X0, double Y0, double W0, int bw) = 0; - virtual ~WarpPerspectiveLine_SSE4() {}; + virtual ~WarpPerspectiveLine_SSE4() {} }; #endif } diff --git a/modules/imgproc/src/imgwarp.sse4_1.cpp b/modules/imgproc/src/imgwarp.sse4_1.cpp index 5625b45f7b..a2ec9396da 100644 --- a/modules/imgproc/src/imgwarp.sse4_1.cpp +++ b/modules/imgproc/src/imgwarp.sse4_1.cpp @@ -492,7 +492,7 @@ public: (X & (INTER_TAB_SIZE - 1))); } } - virtual ~WarpPerspectiveLine_SSE4_Impl() CV_OVERRIDE {}; + virtual ~WarpPerspectiveLine_SSE4_Impl() CV_OVERRIDE {} }; Ptr WarpPerspectiveLine_SSE4::getImpl(const double *M) diff --git a/modules/imgproc/src/resize.cpp b/modules/imgproc/src/resize.cpp index 4ad64534be..f388587f9c 100644 --- a/modules/imgproc/src/resize.cpp +++ b/modules/imgproc/src/resize.cpp @@ -339,7 +339,7 @@ template static void hlineResizeCn(ET* src, int cn, int *ofst, FT* m, FT* dst, int dst_min, int dst_max, int dst_width) { hline::ResizeCn(src, cn, ofst, m, dst, dst_min, dst_max, dst_width); -}; +} template <> void hlineResizeCn(uint8_t* src, int, int *ofst, ufixedpoint16* m, ufixedpoint16* dst, int dst_min, int dst_max, int dst_width) diff --git a/modules/ml/src/inner_functions.cpp b/modules/ml/src/inner_functions.cpp index b823c5ba22..6b3affcebc 100644 --- a/modules/ml/src/inner_functions.cpp +++ b/modules/ml/src/inner_functions.cpp @@ -126,10 +126,10 @@ public: errStrip[idxErr]=err ; - }; + } ParallelCalcError& operator=(const ParallelCalcError &) { return *this; - }; + } }; diff --git a/modules/python/src2/cv2_numpy.hpp b/modules/python/src2/cv2_numpy.hpp index 7c386c7dbc..934333921d 100644 --- a/modules/python/src2/cv2_numpy.hpp +++ b/modules/python/src2/cv2_numpy.hpp @@ -51,13 +51,13 @@ NPY_TYPES asNumpyType() return NPY_U##dst; \ } -CV_GENERATE_INTEGRAL_TYPE_NPY_CONVERSION(int8_t, INT8); +CV_GENERATE_INTEGRAL_TYPE_NPY_CONVERSION(int8_t, INT8) -CV_GENERATE_INTEGRAL_TYPE_NPY_CONVERSION(int16_t, INT16); +CV_GENERATE_INTEGRAL_TYPE_NPY_CONVERSION(int16_t, INT16) -CV_GENERATE_INTEGRAL_TYPE_NPY_CONVERSION(int32_t, INT32); +CV_GENERATE_INTEGRAL_TYPE_NPY_CONVERSION(int32_t, INT32) -CV_GENERATE_INTEGRAL_TYPE_NPY_CONVERSION(int64_t, INT64); +CV_GENERATE_INTEGRAL_TYPE_NPY_CONVERSION(int64_t, INT64) #undef CV_GENERATE_INTEGRAL_TYPE_NPY_CONVERSION diff --git a/modules/python/src2/cv2_util.hpp b/modules/python/src2/cv2_util.hpp index 3662ffcd4d..0d27e98825 100644 --- a/modules/python/src2/cv2_util.hpp +++ b/modules/python/src2/cv2_util.hpp @@ -12,7 +12,7 @@ bool isPythonBindingsDebugEnabled(); void emit_failmsg(PyObject * exc, const char *msg); int failmsg(const char *fmt, ...); -PyObject* failmsgp(const char *fmt, ...);; +PyObject* failmsgp(const char *fmt, ...); //======================================================================================================================