Merge pull request #1772 from SixLabors/af/fix-MagicReferenceDecoder

antonfirsov · web-flow · commit 4ce2d0c55bac · 2021-10-03T15:30:00.000+02:00
Fix a bug in MagickReferenceDecoder
diff --git a/tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/MagickReferenceDecoder.cs b/tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/MagickReferenceDecoder.cs
@@ -32,15 +32,15 @@ public MagickReferenceDecoder()
         private static void FromRgba32Bytes<TPixel>(Configuration configuration, Span<byte> rgbaBytes, IMemoryGroup<TPixel> destinationGroup)
             where TPixel : unmanaged, ImageSharp.PixelFormats.IPixel<TPixel>
         {
+            Span<Rgba32> sourcePixels = MemoryMarshal.Cast<byte, Rgba32>(rgbaBytes);
             foreach (Memory<TPixel> m in destinationGroup)
             {
                 Span<TPixel> destBuffer = m.Span;
-                PixelOperations<TPixel>.Instance.FromRgba32Bytes(
+                PixelOperations<TPixel>.Instance.FromRgba32(
                     configuration,
-                    rgbaBytes,
-                    destBuffer,
-                    destBuffer.Length);
-                rgbaBytes = rgbaBytes.Slice(destBuffer.Length * 4);
+                    sourcePixels.Slice(0, destBuffer.Length),
+                    destBuffer);
+                sourcePixels = sourcePixels.Slice(destBuffer.Length);
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -32,15 +32,15 @@ public MagickReferenceDecoder()`
`32`	`32`	`private static void FromRgba32Bytes<TPixel>(Configuration configuration, Span<byte> rgbaBytes, IMemoryGroup<TPixel> destinationGroup)`
`33`	`33`	`where TPixel : unmanaged, ImageSharp.PixelFormats.IPixel<TPixel>`
`34`	`34`	`{`
	`35`	`+ Span<Rgba32> sourcePixels = MemoryMarshal.Cast<byte, Rgba32>(rgbaBytes);`
`35`	`36`	`foreach (Memory<TPixel> m in destinationGroup)`
`36`	`37`	`{`
`37`	`38`	`Span<TPixel> destBuffer = m.Span;`
`38`		`- PixelOperations<TPixel>.Instance.FromRgba32Bytes(`
	`39`	`+ PixelOperations<TPixel>.Instance.FromRgba32(`
`39`	`40`	`configuration,`
`40`		`- rgbaBytes,`
`41`		`- destBuffer,`
`42`		`- destBuffer.Length);`
`43`		`- rgbaBytes = rgbaBytes.Slice(destBuffer.Length * 4);`
	`41`	`+ sourcePixels.Slice(0, destBuffer.Length),`
	`42`	`+ destBuffer);`
	`43`	`+ sourcePixels = sourcePixels.Slice(destBuffer.Length);`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`