potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 08:13:04 +04:00
Code Packages Releases Wiki Activity

Merge branch 4.x

Browse Source
This commit is contained in:
Alexander Smorkalov
2025-05-27 16:48:22 +03:00
parent 349b44a485 344f8c6400
commit 350b211b57
167 changed files with 7028 additions and 4687 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/imgproc/test/test_bilateral_filter.cpp
+6 -4
View File
@@ -110,10 +110,12 @@ namespace opencv_test { namespace {
src.type() == dst.type() && src.size() == dst.size() &&
src.data != dst.data );
if( sigma_color <= 0 )
sigma_color = 1;
if( sigma_space <= 0 )
sigma_space = 1;
constexpr double eps = 1e-6;
if( sigma_color <= eps || sigma_space <= eps )
{
src.copyTo(dst);
return;
}
double gauss_color_coeff = -0.5/(sigma_color*sigma_color);
double gauss_space_coeff = -0.5/(sigma_space*sigma_space);
modules/imgproc/test/test_drawing.cpp
+2 -2
View File
@@ -966,7 +966,7 @@ TEST(Drawing, fillpoly_fully)
cv::Mat labelImage(binary.size(), CV_32S);
cv::Mat labelCentroids;
int labels = cv::connectedComponents(binary, labelImage, 4);
EXPECT_EQ(2, labels) << "artifacts occured";
EXPECT_EQ(2, labels) << "artifacts occurred";
}
// check if filling went over border
@@ -1055,7 +1055,7 @@ PARAM_TEST_CASE(FillPolyFully, unsigned, unsigned, int, int, Point, cv::LineType
cv::Mat labelImage(binary.size(), CV_32S);
cv::Mat labelCentroids;
int labels = cv::connectedComponents(binary, labelImage, 4);
EXPECT_EQ(2, labels) << "artifacts occured";
EXPECT_EQ(2, labels) << "artifacts occurred";
}
void check_filling_over_border(cv::Mat& img, const std::vector<cv::Point>& polygonPoints)