mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-07 17:44:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed most clang -Wextra-semi warnings

Browse Source
This commit is contained in:
Sean McBride 2022-09-27 18:06:46 -04:00
parent 3a64607d94
commit 1829eba584
14 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
modules/calib3d/src/chessboard.hpp
View File

@ -43,7 +43,7 @@ class FastX : public cv::Feature2D
public:
FastX(const Parameters &config = Parameters());
virtual ~FastX(){};
virtual ~FastX(){}
void reconfigure(const Parameters &para);
@ -74,8 +74,8 @@ class FastX : public cv::Feature2D
std::vector<std::vector<float> > calcAngles(const std::vector<cv::Mat> &rotated_images,
std::vector<cv::KeyPoint> &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<cv::KeyPoint>& 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<cv::Mat> &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<cv::KeyPoint>& keypoints, cv::OutputArray descriptors, bool useProvidedKeypoints=false )const
{
descriptors.clear();

4
modules/calib3d/src/usac/estimator.cpp
View File

@ -23,7 +23,7 @@ public:
int estimateModelNonMinimalSample(const std::vector<int> &sample, int sample_size,
std::vector<Mat> &models, const std::vector<double> &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<int> &sample, int sample_size,
std::vector<Mat> &models, const std::vector<double> &weights) const override {
return non_min_solver->estimate(sample, sample_size, models, weights);
};
}
int getMaxNumSolutions () const override {
return min_solver->getMaxNumberOfSolutions();
}

2
modules/core/include/opencv2/core/utils/trace.private.hpp
View File

@ -63,7 +63,7 @@ class TraceMessage;
class TraceStorage {
public:
TraceStorage() {}
virtual ~TraceStorage() {};
virtual ~TraceStorage() {}
virtual bool put(const TraceMessage& msg) const = 0;
};

2
modules/core/src/parallel/registry_parallel.impl.hpp
View File

@ -43,7 +43,7 @@ std::vector<ParallelBackendInfo>& getBuiltinParallelBackendsInfo()
#endif
};
return g_backends;
};
}
static
bool sortByPriority(const ParallelBackendInfo &lhs, const ParallelBackendInfo &rhs)

2
modules/features2d/src/fast.avx2.cpp
View File

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

2
modules/features2d/src/fast.hpp
View File

@ -54,7 +54,7 @@ class FAST_t_patternSize16_AVX2
public:
static Ptr<FAST_t_patternSize16_AVX2> 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
}

4
modules/imgcodecs/include/opencv2/imgcodecs.hpp
View File

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

2
modules/imgproc/src/filter.dispatch.cpp
View File

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

2
modules/imgproc/src/imgwarp.hpp
View File

@ -82,7 +82,7 @@ public:
static Ptr<WarpPerspectiveLine_SSE4> 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
}

2
modules/imgproc/src/imgwarp.sse4_1.cpp
View File

@ -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> WarpPerspectiveLine_SSE4::getImpl(const double *M)

2
modules/imgproc/src/resize.cpp
View File

@ -339,7 +339,7 @@ template <typename ET, typename FT, int n, bool mulall, int cncnt>
static void hlineResizeCn(ET* src, int cn, int *ofst, FT* m, FT* dst, int dst_min, int dst_max, int dst_width)
{
hline<ET, FT, n, mulall, cncnt>::ResizeCn(src, cn, ofst, m, dst, dst_min, dst_max, dst_width);
};
}
template <>
void hlineResizeCn<uint8_t, ufixedpoint16, 2, true, 1>(uint8_t* src, int, int *ofst, ufixedpoint16* m, ufixedpoint16* dst, int dst_min, int dst_max, int dst_width)

4
modules/ml/src/inner_functions.cpp
View File

@ -126,10 +126,10 @@ public:
errStrip[idxErr]=err ;
};
}
ParallelCalcError& operator=(const ParallelCalcError &) {
return *this;
};
}
};

8
modules/python/src2/cv2_numpy.hpp
View File

@ -51,13 +51,13 @@ NPY_TYPES asNumpyType<bool>()
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

2
modules/python/src2/cv2_util.hpp
View File

@ -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, ...);
//======================================================================================================================