Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit5fb3869

Browse files
seanmasmorkalov
andauthored
Merge pull request#23109 from seanm:misc-warnings
* Fixed clang -Wnewline-eof warnings* Fixed all trivial clang -Wextra-semi and -Wc++98-compat-extra-semi warnings* Removed trailing semi from various macros* Fixed various -Wunused-macros warnings* Fixed some trivial -Wdocumentation warnings* Fixed some -Wdocumentation-deprecated-sync warnings* Fixed incorrect indentation* Suppressed some clang warnings in 3rd party code* Fixed QRCodeEncoder::Params documentation.---------Co-authored-by: Alexander Smorkalov <alexander.smorkalov@xperience.ai>
1 parent24fd395 commit5fb3869

File tree

135 files changed

+620
-534
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

135 files changed

+620
-534
lines changed

‎3rdparty/openjpeg/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ ocv_warnings_disable(CMAKE_C_FLAGS
1616
-Wunused-but-set-variable# clang15
1717
-Wmissing-prototypes# clang, function opj_t1_ht_decode_cblk
1818
-Wmissing-declarations# gcc, function opj_t1_ht_decode_cblk
19+
-Wdocumentation# clang
1920
)
2021

2122
#-----------------------------------------------------------------------------

‎3rdparty/protobuf/CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ else()
2727
-Wimplicit-fallthrough
2828
-Warray-bounds# GCC 9+
2929
-Wstringop-overflow -Wstringop-overread# GCC 11-12
30+
-Wextra-semi# clang
31+
-Wcomma# clang
3032
)
3133
endif()
3234
if(CV_ICC)

‎modules/calib3d/perf/perf_stereosgbm.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ using namespace testing;
4343

4444
staticvoidMakeArtificialExample(Mat& dst_left_view, Mat& dst_view);
4545

46-
CV_ENUM(SGBMModes, StereoSGBM::MODE_SGBM, StereoSGBM::MODE_SGBM_3WAY, StereoSGBM::MODE_HH4);
46+
CV_ENUM(SGBMModes, StereoSGBM::MODE_SGBM, StereoSGBM::MODE_SGBM_3WAY, StereoSGBM::MODE_HH4)
4747
typedef tuple<Size,int, SGBMModes> SGBMParams;
4848
typedef TestBaseWithParam<SGBMParams> TestStereoCorrespSGBM;
4949

‎modules/calib3d/src/chessboard.hpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -203,12 +203,12 @@ class Chessboard: public cv::Feature2D
203203
* d12/d34 = d13/d24
204204
*
205205
* point order on the line:
206-
*pt1 -->pt2 -->pt3 -->pt4
206+
*p0 -->p1 -->p2 -->p3
207207
*
208-
* \param[in]pt1 First point coordinate
209-
* \param[in]pt2 Second point coordinate
210-
* \param[in]pt3 Third point coordinate
211-
* \param[out]pt4 Forth point coordinate
208+
* \param[in]p0 First point coordinate
209+
* \param[in]p1 Second point coordinate
210+
* \param[in]p2 Third point coordinate
211+
* \param[out]p3 Forth point coordinate
212212
*
213213
*/
214214
staticboolestimatePoint(const cv::Point2f &p0,const cv::Point2f &p1,const cv::Point2f &p2,cv::Point2f &p3);
@@ -309,7 +309,7 @@ class Chessboard: public cv::Feature2D
309309
* \brief Draws the corners into the given image
310310
*
311311
* \param[in] m The image
312-
* \param[out]m The resulting image
312+
* \param[out]out The resulting image
313313
* \param[in] H optional homography to calculate search area
314314
*
315315
*/
@@ -668,7 +668,7 @@ class Chessboard: public cv::Feature2D
668668
* \brief Calculates the average edge sharpness for the chessboard
669669
*
670670
* \param[in] image The image where the chessboard was detected
671-
* \param[in]rise_distante Rise distance 0.8 means 10% ... 90%
671+
* \param[in]rise_distance Rise distance 0.8 means 10% ... 90%
672672
* \param[in] vertical by default only edge response for horiontal lines are calculated
673673
*
674674
* \returns Scalar(sharpness, average min_val, average max_val)

‎modules/calib3d/src/fundam.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ class HomographyEstimatorCallback CV_FINAL : public PointSetRegistrator::Callbac
113113
* 2 columns 1 channel
114114
* @param _m2 destination points containing (x,y), depth is CV_32F with 1 column 2 channels or
115115
* 2 columns 1 channel
116-
* @param _model, CV_64FC1, 3x3, normalized, i.e., the last element is 1
116+
* @param _model CV_64FC1, 3x3, normalized, i.e., the last element is 1
117117
*/
118118
intrunKernel( InputArray _m1, InputArray _m2, OutputArray _model )const CV_OVERRIDE
119119
{
@@ -188,7 +188,7 @@ class HomographyEstimatorCallback CV_FINAL : public PointSetRegistrator::Callbac
188188
* @param _m1 depth CV_32F, 1-channel with 2 columns or 2-channel with 1 column
189189
* @param _m2 depth CV_32F, 1-channel with 2 columns or 2-channel with 1 column
190190
* @param _model CV_64FC1, 3x3
191-
* @param _err, output, CV_32FC1, square of the L2 norm
191+
* @param _err output, CV_32FC1, square of the L2 norm
192192
*/
193193
voidcomputeError( InputArray _m1, InputArray _m2, InputArray _model, OutputArray _err )const CV_OVERRIDE
194194
{

‎modules/calib3d/src/ippe.hpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ class PoseSolver {
111111
/**
112112
* @brief Computes the translation solution for a given rotation solution
113113
* @param objectPoints Array of corresponding object points, 1xN/Nx1 3-channel where N is the number of points
114-
* @paramnormalizedImagePoints Array of corresponding image points (undistorted), 1xN/Nx1 2-channel where N is the number of points
114+
* @paramnormalizedImgPoints Array of corresponding image points (undistorted), 1xN/Nx1 2-channel where N is the number of points
115115
* @param R Rotation solution (3x1 rotation vector)
116116
* @param t Translation solution (3x1 rotation vector)
117117
*/
@@ -220,10 +220,10 @@ class PoseSolver {
220220

221221
/**
222222
* @brief Computes the average depth of an object given its pose in camera coordinates
223-
* @param objectPoints: Object points defined in 3D object space
224-
* @param rvec: Rotation component of pose
225-
* @param tvec: Translation component of pose
226-
* @return: average depth of the object
223+
* @param objectPoints Object points defined in 3D object space
224+
* @param rvec Rotation component of pose
225+
* @param tvec Translation component of pose
226+
* @return average depth of the object
227227
*/
228228
doublemeanSceneDepth(InputArray objectPoints, InputArray rvec, InputArray tvec);
229229

‎modules/calib3d/src/p3p.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,8 +214,8 @@ int p3p::solve(double R[4][3][3], double t[4][3],
214214
/// Only the solution to the main branch.
215215
/// Reference : X.S. Gao, X.-R. Hou, J. Tang, H.-F. Chang; "Complete Solution Classification for the Perspective-Three-Point Problem"
216216
/// IEEE Trans. on PAMI, vol. 25, No. 8, August 2003
217-
/// \paramlengths3D Lengths of line segments up to four solutions.
218-
/// \paramdist3D Distance between 3D points in pairs |BC|, |AC|, |AB|.
217+
/// \paramlengths Lengths of line segments up to four solutions.
218+
/// \paramdistances Distance between 3D points in pairs |BC|, |AC|, |AB|.
219219
/// \param cosines Cosine of the angles /_BPC, /_APC, /_APB.
220220
/// \returns Number of solutions.
221221
/// WARNING: NOT ALL THE DEGENERATE CASES ARE IMPLEMENTED

‎modules/calib3d/src/precomp.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ namespace cv
6969
* @param ep outlier ratio
7070
* @param modelPoints number of model points required for estimation
7171
* @param maxIters maximum number of iterations
72-
* @return
72+
* @return The number of iterations according to the formula
7373
* \f[
7474
* \frac{\ln(1-p)}{\ln\left(1-(1-ep)^\mathrm{modelPoints}\right)}
7575
* \f]

‎modules/calib3d/src/rho.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@ void rhoSeed(Ptr<RHO_HEST> p, uint64_t seed){
490490
* Estimates the homography using the given context, matches and parameters to
491491
* PROSAC.
492492
*
493-
* @param [in/out] p The context to use for homography estimation. Must
493+
* @param [in,out] p The context to use for homography estimation. Must
494494
* be already initialized. Cannot be NULL.
495495
* @param [in] src The pointer to the source points of the matches.
496496
* Must be aligned to 4 bytes. Cannot be NULL.

‎modules/calib3d/src/rho.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ void rhoSeed(Ptr<RHO_HEST> p, uint64_t seed);
215215
* homography with at least the minimum required support, and 0 if it was not.
216216
*
217217
*
218-
* @param [in/out] p The context to use for homography estimation. Must
218+
* @param [in,out] p The context to use for homography estimation. Must
219219
* be already initialized. Cannot be NULL.
220220
* @param [in] src The pointer to the source points of the matches.
221221
* Must be aligned to 4 bytes. Cannot be NULL.

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp