From 0a88f84847b8d22582d11ed054cdbe33512b6a25 Mon Sep 17 00:00:00 2001 From: Vincent Rabaud <vrabaud@users.noreply.github.com> Date: Fri, 8 Jul 2022 00:24:01 +0200 Subject: [PATCH] Merge pull request #22208 from vrabaud:34_calibinit Add missing code. * Add missing code. This was removed in c7fc563dc0ac2d21ad2bd618e741227c0a4b4f76 The resize is also a side-effect. * Use shorteer cv::Point2f *= --- modules/calib3d/src/calibinit.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/calib3d/src/calibinit.cpp b/modules/calib3d/src/calibinit.cpp index 0a8cdd5c6f..1dff8de6e6 100644 --- a/modules/calib3d/src/calibinit.cpp +++ b/modules/calib3d/src/calibinit.cpp @@ -1232,7 +1232,7 @@ int ChessBoardDetector::cleanFoundConnectedQuads(std::vector<ChessBoardQuad*>& q centers[i] = ci; center += ci; } - center.x *= (1.0f / quad_count); + center *= (1.0f / quad_count); // If we still have more quadrangles than we should, // we try to eliminate bad ones based on minimizing the bounding box. @@ -1298,6 +1298,7 @@ int ChessBoardDetector::cleanFoundConnectedQuads(std::vector<ChessBoardQuad*>& q quad_group[min_box_area_index] = quad_group[quad_count]; centers[min_box_area_index] = centers[quad_count]; } + quad_group.resize(quad_count); return quad_count; }