From e9050395be369976e1c17e4ad06748b294291042 Mon Sep 17 00:00:00 2001 From: Yuan-Chu Tai Date: Fri, 5 Jan 2024 14:13:04 +0800 Subject: [PATCH 1/3] add maxconers and mindistance setter to gftt --- modules/cudaimgproc/include/opencv2/cudaimgproc.hpp | 3 +++ modules/cudaimgproc/src/gftt.cpp | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/cudaimgproc/include/opencv2/cudaimgproc.hpp b/modules/cudaimgproc/include/opencv2/cudaimgproc.hpp index 4c9ee0f48e8..00edfc19838 100644 --- a/modules/cudaimgproc/include/opencv2/cudaimgproc.hpp +++ b/modules/cudaimgproc/include/opencv2/cudaimgproc.hpp @@ -578,6 +578,9 @@ class CV_EXPORTS_W CornersDetector : public Algorithm @param stream Stream for the asynchronous version. */ CV_WRAP virtual void detect(InputArray image, OutputArray corners, InputArray mask = noArray(), Stream& stream = Stream::Null()) = 0; + + virtual void setMaxCorners(int maxCorners) = 0; + virtual void setMinDistance(double minDistance) = 0; }; /** @brief Creates implementation for cuda::CornersDetector . diff --git a/modules/cudaimgproc/src/gftt.cpp b/modules/cudaimgproc/src/gftt.cpp index 540534a87ab..2d3c51297b7 100644 --- a/modules/cudaimgproc/src/gftt.cpp +++ b/modules/cudaimgproc/src/gftt.cpp @@ -69,7 +69,8 @@ namespace int blockSize, bool useHarrisDetector, double harrisK); ~GoodFeaturesToTrackDetector(); void detect(InputArray image, OutputArray corners, InputArray mask, Stream& stream); - + void setMaxCorners(int maxCorners) CV_OVERRIDE { maxCorners_ = maxCorners; } + void setMinDistance(double minDistance) CV_OVERRIDE { minDistance_ = minDistance; } private: int maxCorners_; double qualityLevel_; From 0322b4621d43e1a9a8f02fc93a9cb0dee1c898bc Mon Sep 17 00:00:00 2001 From: zanaviska <31745527+zanaviska@users.noreply.github.com> Date: Sun, 21 Jan 2024 14:52:42 +0000 Subject: [PATCH 2/3] Fix gcc11 warning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ‘error’ may be used uninitialized --- modules/ximgproc/src/edge_drawing.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ximgproc/src/edge_drawing.cpp b/modules/ximgproc/src/edge_drawing.cpp index 4ff15324b70..fab94fc6336 100644 --- a/modules/ximgproc/src/edge_drawing.cpp +++ b/modules/ximgproc/src/edge_drawing.cpp @@ -1366,7 +1366,7 @@ void EdgeDrawingImpl::SplitSegment2Lines(double* x, double* y, int noPixels, int { // Start by fitting a line to MIN_LINE_LEN pixels bool valid = false; - double lastA(0), lastB(0), error; + double lastA(0), lastB(0), error(0); int lastInvert(0); while (noPixels >= min_line_len) From 17354903b29a56929d882414116ab007a3e4009a Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Thu, 1 Feb 2024 18:05:06 +0300 Subject: [PATCH 3/3] Wrap new methods to python and java. --- modules/cudaimgproc/include/opencv2/cudaimgproc.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/cudaimgproc/include/opencv2/cudaimgproc.hpp b/modules/cudaimgproc/include/opencv2/cudaimgproc.hpp index 00edfc19838..aab80799643 100644 --- a/modules/cudaimgproc/include/opencv2/cudaimgproc.hpp +++ b/modules/cudaimgproc/include/opencv2/cudaimgproc.hpp @@ -579,8 +579,8 @@ class CV_EXPORTS_W CornersDetector : public Algorithm */ CV_WRAP virtual void detect(InputArray image, OutputArray corners, InputArray mask = noArray(), Stream& stream = Stream::Null()) = 0; - virtual void setMaxCorners(int maxCorners) = 0; - virtual void setMinDistance(double minDistance) = 0; + CV_WRAP virtual void setMaxCorners(int maxCorners) = 0; + CV_WRAP virtual void setMinDistance(double minDistance) = 0; }; /** @brief Creates implementation for cuda::CornersDetector .