refactored HoughCircles (converted it into Algorithm)

modules/gpuimgproc/include/opencv2/gpuimgproc.hpp

@@ -297,17 +297,46 @@ inline void HoughLinesP(InputArray src, OutputArray lines, float rho, float thet
 //////////////////////////////////////
 // HoughCircles
 
-struct HoughCirclesBuf
+class CV_EXPORTS HoughCirclesDetector : public Algorithm
 {
-    GpuMat edges;
-    GpuMat accum;
-    GpuMat list;
-    Ptr<CannyEdgeDetector> canny;
+public:
+    virtual void detect(InputArray src, OutputArray circles) = 0;
+
+    virtual void setDp(float dp) = 0;
+    virtual float getDp() const = 0;
+
+    virtual void setMinDist(float minDist) = 0;
+    virtual float getMinDist() const = 0;
+
+    virtual void setCannyThreshold(int cannyThreshold) = 0;
+    virtual int getCannyThreshold() const = 0;
+
+    virtual void setVotesThreshold(int votesThreshold) = 0;
+    virtual int getVotesThreshold() const = 0;
+
+    virtual void setMinRadius(int minRadius) = 0;
+    virtual int getMinRadius() const = 0;
+
+    virtual void setMaxRadius(int maxRadius) = 0;
+    virtual int getMaxRadius() const = 0;
+
+    virtual void setMaxCircles(int maxCircles) = 0;
+    virtual int getMaxCircles() const = 0;
 };
 
-CV_EXPORTS void HoughCircles(const GpuMat& src, GpuMat& circles, int method, float dp, float minDist, int cannyThreshold, int votesThreshold, int minRadius, int maxRadius, int maxCircles = 4096);
-CV_EXPORTS void HoughCircles(const GpuMat& src, GpuMat& circles, HoughCirclesBuf& buf, int method, float dp, float minDist, int cannyThreshold, int votesThreshold, int minRadius, int maxRadius, int maxCircles = 4096);
-CV_EXPORTS void HoughCirclesDownload(const GpuMat& d_circles, OutputArray h_circles);
+CV_EXPORTS Ptr<HoughCirclesDetector> createHoughCirclesDetector(float dp, float minDist, int cannyThreshold, int votesThreshold, int minRadius, int maxRadius, int maxCircles = 4096);
+
+// obsolete
+
+__OPENCV_GPUIMGPROC_DEPR_BEFORE__ void HoughCircles(InputArray src, OutputArray circles,
+                                                    int method, float dp, float minDist, int cannyThreshold, int votesThreshold,
+                                                    int minRadius, int maxRadius, int maxCircles = 4096) __OPENCV_GPUIMGPROC_DEPR_AFTER__;
+
+inline void HoughCircles(InputArray src, OutputArray circles, int /*method*/, float dp, float minDist,
+                         int cannyThreshold, int votesThreshold, int minRadius, int maxRadius, int maxCircles)
+{
+    gpu::createHoughCirclesDetector(dp, minDist, cannyThreshold, votesThreshold, minRadius, maxRadius, maxCircles)->detect(src, circles);
+}
 
 //////////////////////////////////////
 // GeneralizedHough

modules/gpuimgproc/perf/perf_hough.cpp

@@ -203,9 +203,10 @@ PERF_TEST_P(Sz_Dp_MinDist, HoughCircles,
     {
         const cv::gpu::GpuMat d_src(src);
         cv::gpu::GpuMat d_circles;
-        cv::gpu::HoughCirclesBuf d_buf;
 
-        TEST_CYCLE() cv::gpu::HoughCircles(d_src, d_circles, d_buf, cv::HOUGH_GRADIENT, dp, minDist, cannyThreshold, votesThreshold, minRadius, maxRadius);
+        cv::Ptr<cv::gpu::HoughCirclesDetector> houghCircles = cv::gpu::createHoughCirclesDetector(dp, minDist, cannyThreshold, votesThreshold, minRadius, maxRadius);
+
+        TEST_CYCLE() houghCircles->detect(d_src, d_circles);
 
         cv::Mat gpu_circles(d_circles);
         cv::Vec3f* begin = gpu_circles.ptr<cv::Vec3f>(0);

modules/gpuimgproc/src/canny.cpp

@@ -170,6 +170,9 @@ namespace
         CV_Assert( dy.type() == dx.type() && dy.size() == dx.size() );
         CV_Assert( deviceSupports(SHARED_ATOMICS) );
 
+        dx.copyTo(dx_);
+        dy.copyTo(dy_);
+
         if (low_thresh_ > high_thresh_)
             std::swap(low_thresh_, high_thresh_);
 

modules/gpuimgproc/test/test_hough.cpp

@@ -150,11 +150,13 @@ GPU_TEST_P(HoughCircles, Accuracy)
     cv::Mat src(size, CV_8UC1);
     drawCircles(src, circles_gold, true);
 
+    cv::Ptr<cv::gpu::HoughCirclesDetector> houghCircles = cv::gpu::createHoughCirclesDetector(dp, minDist, cannyThreshold, votesThreshold, minRadius, maxRadius);
+
     cv::gpu::GpuMat d_circles;
-    cv::gpu::HoughCircles(loadMat(src, useRoi), d_circles, cv::HOUGH_GRADIENT, dp, minDist, cannyThreshold, votesThreshold, minRadius, maxRadius);
+    houghCircles->detect(loadMat(src, useRoi), d_circles);
 
     std::vector<cv::Vec3f> circles;
-    cv::gpu::HoughCirclesDownload(d_circles, circles);
+    d_circles.download(circles);
 
     ASSERT_FALSE(circles.empty());