1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00

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>
This commit is contained in:
Sean McBride
2023-10-06 06:33:21 -04:00
committed by GitHub
parent 24fd39538e
commit 5fb3869775
135 changed files with 620 additions and 534 deletions
@@ -692,7 +692,7 @@ static void _identifyCandidates(InputArray grey,
/**
* Line fitting A * B = C :: Called from function refineCandidateLines
* @param nContours, contour-container
* @param nContours contour-container
*/
static Point3f _interpolate2Dline(const vector<Point2f>& nContours){
CV_Assert(nContours.size() >= 2);
@@ -748,10 +748,8 @@ static Point2f _getCrossPoint(Point3f nLine1, Point3f nLine2){
/**
* Refine Corners using the contour vector :: Called from function detectMarkers
* @param nContours, contour-container
* @param nCorners, candidate Corners
* @param camMatrix, cameraMatrix input 3x3 floating-point camera matrix
* @param distCoeff, distCoeffs vector of distortion coefficient
* @param nContours contour-container
* @param nCorners candidate Corners
*/
static void _refineCandidateLines(vector<Point>& nContours, vector<Point2f>& nCorners){
vector<Point2f> contour2f(nContours.begin(), nContours.end());
+4 -4
View File
@@ -25,7 +25,7 @@ public:
net.setPreferableBackend(backend_id);
net.setPreferableTarget(target_id);
};
}
void alignCrop(InputArray _src_img, InputArray _face_mat, OutputArray _aligned_img) const override
{
Mat face_mat = _face_mat.getMat();
@@ -39,13 +39,13 @@ public:
}
Mat warp_mat = getSimilarityTransformMatrix(src_point);
warpAffine(_src_img, _aligned_img, warp_mat, Size(112, 112), INTER_LINEAR);
};
}
void feature(InputArray _aligned_img, OutputArray _face_feature) override
{
Mat inputBolb = dnn::blobFromImage(_aligned_img, 1, Size(112, 112), Scalar(0, 0, 0), true, false);
net.setInput(inputBolb);
net.forward(_face_feature);
};
}
double match(InputArray _face_feature1, InputArray _face_feature2, int dis_type) const override
{
Mat face_feature1 = _face_feature1.getMat(), face_feature2 = _face_feature2.getMat();
@@ -60,7 +60,7 @@ public:
throw std::invalid_argument("invalid parameter " + std::to_string(dis_type));
}
};
}
private:
Mat getSimilarityTransformMatrix(float src[5][2]) const {
+1 -1
View File
@@ -703,7 +703,7 @@ bool QRCodeEncoderImpl::stringToBits(const std::string& input_info)
default:
return encodeAuto(input_info, payload);
}
};
}
void QRCodeEncoderImpl::eccGenerate(vector<vector<uint8_t> > &data_blocks, vector<vector<uint8_t> > &ecc_blocks)
{