Merge pull request #1362 from rold2007/master

brianpopow · web-flow · commit ee30c71a87d6 · 2020-09-26T16:10:46.000+02:00
Fixed typo in AdaptiveThreshold
diff --git a/src/ImageSharp/Processing/Processors/Binarization/AdaptiveThresholdProcessor{TPixel}.cs b/src/ImageSharp/Processing/Processors/Binarization/AdaptiveThresholdProcessor{TPixel}.cs
@@ -67,7 +67,8 @@ protected override void OnFrameApply(ImageFrame<TPixel> source)
                         ref TPixel color = ref Unsafe.Add(ref rowRef, x);
                         color.ToRgba32(ref rgb);
 
-                        sum += (ulong)(rgb.R + rgb.G + rgb.G);
+                        sum += (ulong)(rgb.R + rgb.G + rgb.B);
+
                         if (x - startX != 0)
                         {
                             intImage[x - startX, y - startY] = intImage[x - startX - 1, y - startY] + sum;
diff --git a/tests/ImageSharp.Tests/Processing/Binarization/AdaptiveThresholdTests.cs b/tests/ImageSharp.Tests/Processing/Binarization/AdaptiveThresholdTests.cs
@@ -100,6 +100,7 @@ public void AdaptiveThreshold_SettingUpperLowerWithThresholdLimit_WithRectangle_
         [Theory]
         [WithFile(TestImages.Png.Bradley01, PixelTypes.Rgba32)]
         [WithFile(TestImages.Png.Bradley02, PixelTypes.Rgba32)]
+        [WithFile(TestImages.Png.Ducky, PixelTypes.Rgba32)]
         public void AdaptiveThreshold_Works<TPixel>(TestImageProvider<TPixel> provider)
             where TPixel : unmanaged, IPixel<TPixel>
         {
diff --git a/tests/Images/External b/tests/Images/External
@@ -1 +1 @@
-Subproject commit 6a003080674d1fedc66292c13ce5a357b2a33083
+Subproject commit 28839f6eaa212a575005df630b6030bb4314a75b

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,8 @@ protected override void OnFrameApply(ImageFrame<TPixel> source)`
`67`	`67`	`ref TPixel color = ref Unsafe.Add(ref rowRef, x);`
`68`	`68`	`color.ToRgba32(ref rgb);`
`69`	`69`
`70`		`- sum += (ulong)(rgb.R + rgb.G + rgb.G);`
	`70`	`+ sum += (ulong)(rgb.R + rgb.G + rgb.B);`
	`71`	`+`
`71`	`72`	`if (x - startX != 0)`
`72`	`73`	`{`
`73`	`74`	`intImage[x - startX, y - startY] = intImage[x - startX - 1, y - startY] + sum;`
Original file line number	Diff line number	Diff line change
`@@ -100,6 +100,7 @@ public void AdaptiveThreshold_SettingUpperLowerWithThresholdLimit_WithRectangle_`
`100`	`100`	`[Theory]`
`101`	`101`	`[WithFile(TestImages.Png.Bradley01, PixelTypes.Rgba32)]`
`102`	`102`	`[WithFile(TestImages.Png.Bradley02, PixelTypes.Rgba32)]`
	`103`	`+ [WithFile(TestImages.Png.Ducky, PixelTypes.Rgba32)]`
`103`	`104`	`public void AdaptiveThreshold_Works<TPixel>(TestImageProvider<TPixel> provider)`
`104`	`105`	`where TPixel : unmanaged, IPixel<TPixel>`
`105`	`106`	`{`