Merge pull request #3830 from sturkmen72:upd_find_ellipses_cpp

asmorkalov · web-flow · commit 5409e01d01e8 · 2024-11-26T13:57:08.000+03:00
Fix: ximgproc::findEllipses modifies src image unexpectedly
diff --git a/modules/ximgproc/src/find_ellipses.cpp b/modules/ximgproc/src/find_ellipses.cpp
@@ -1218,9 +1218,10 @@ void EllipseDetectorImpl::getTriplets413(VVP &pi, VVP &pj, VVP &pk,
     }
 }
 
-void EllipseDetectorImpl::preProcessing(Mat1b &image, Mat1b &dp, Mat1b &dn) {
+void EllipseDetectorImpl::preProcessing(Mat1b &src, Mat1b &dp, Mat1b &dn) {
     // smooth image
-    GaussianBlur(image, image, _kernelSize, _sigma);
+    Mat image;
+    GaussianBlur(src, image, _kernelSize, _sigma);
 
     // temp variables
     Mat1b edges;// edge mask

Original file line number	Diff line number	Diff line change
`@@ -1218,9 +1218,10 @@ void EllipseDetectorImpl::getTriplets413(VVP &pi, VVP &pj, VVP &pk,`
`1218`	`1218`	`}`
`1219`	`1219`	`}`
`1220`	`1220`
`1221`		`-void EllipseDetectorImpl::preProcessing(Mat1b &image, Mat1b &dp, Mat1b &dn) {`
	`1221`	`+void EllipseDetectorImpl::preProcessing(Mat1b &src, Mat1b &dp, Mat1b &dn) {`
`1222`	`1222`	`// smooth image`
`1223`		`- GaussianBlur(image, image, _kernelSize, _sigma);`
	`1223`	`+ Mat image;`
	`1224`	`+ GaussianBlur(src, image, _kernelSize, _sigma);`
`1224`	`1225`
`1225`	`1226`	`// temp variables`
`1226`	`1227`	`Mat1b edges;// edge mask`