Merge pull request #1756 from smx-smx/fix/FastNlMeansDenoisingMulti

shimat · web-flow · commit 18ca834e8fdf · 2025-05-06T22:30:14.000+09:00
fix crash in FastNlMeansDenoisingMulti
diff --git a/src/OpenCvSharpExtern/photo.h b/src/OpenCvSharpExtern/photo.h
@@ -37,7 +37,7 @@ CVAPI(ExceptionStatus) photo_fastNlMeansDenoisingMulti(cv::Mat **srcImgs, int sr
 {
     BEGIN_WRAP
 
-    std::vector<cv::Mat> srcImgsVec;
+    std::vector<cv::Mat> srcImgsVec(srcImgsLength);
     for (int i = 0; i < srcImgsLength; i++)
         srcImgsVec[i] = *srcImgs[i];
 
diff --git a/test/OpenCvSharp.Tests/photo/PhotoTest.cs b/test/OpenCvSharp.Tests/photo/PhotoTest.cs
@@ -32,7 +32,6 @@ public void FastNlMeansDenoising()
             Window.ShowImages(src, dst);
     }
 
-    /*
     [Fact]
     public void FastNlMeansDenoisingMulti()
     {
@@ -45,5 +44,5 @@ public void FastNlMeansDenoisingMulti()
 
         if (Debugger.IsAttached)
             Window.ShowImages(src1, src2, dst);
-    }*/
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ CVAPI(ExceptionStatus) photo_fastNlMeansDenoisingMulti(cv::Mat **srcImgs, int sr`
`37`	`37`	`{`
`38`	`38`	`BEGIN_WRAP`
`39`	`39`
`40`		`- std::vector<cv::Mat> srcImgsVec;`
	`40`	`+ std::vector<cv::Mat> srcImgsVec(srcImgsLength);`
`41`	`41`	`for (int i = 0; i < srcImgsLength; i++)`
`42`	`42`	`srcImgsVec[i] = *srcImgs[i];`
`43`	`43`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,6 @@ public void FastNlMeansDenoising()`
`32`	`32`	`Window.ShowImages(src, dst);`
`33`	`33`	`}`
`34`	`34`
`35`		`- /*`
`36`	`35`	`[Fact]`
`37`	`36`	`public void FastNlMeansDenoisingMulti()`
`38`	`37`	`{`
`@@ -45,5 +44,5 @@ public void FastNlMeansDenoisingMulti()`
`45`	`44`
`46`	`45`	`if (Debugger.IsAttached)`
`47`	`46`	`Window.ShowImages(src1, src2, dst);`
`48`		`- }*/`
	`47`	`+ }`
`49`	`48`	`}`