diff --git a/tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/MagickReferenceEncoder.cs b/tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/MagickReferenceEncoder.cs deleted file mode 100644 index effd30ec6c..0000000000 --- a/tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/MagickReferenceEncoder.cs +++ /dev/null @@ -1,60 +0,0 @@ -// Copyright (c) Six Labors and contributors. -// Licensed under the Apache License, Version 2.0. - -using System; -using System.IO; - -using SixLabors.ImageSharp.Formats; -using SixLabors.ImageSharp.PixelFormats; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -using ImageMagick; - -using SixLabors.ImageSharp.Advanced; - -namespace SixLabors.ImageSharp.Tests.TestUtilities.ReferenceCodecs -{ - public class MagickReferenceEncoder : IImageEncoder - { - public MagickReferenceEncoder(MagickFormat format) - { - this.Format = format; - } - - public MagickFormat Format { get; } - - public void Encode(Image image, Stream stream) - where TPixel : struct, IPixel - { - var black = MagickColor.FromRgba(0, 0, 0, 255); - using (var magickImage = new MagickImage(black, image.Width, image.Height)) - { - bool isDeep = Unsafe.SizeOf() > 4; - - magickImage.Depth = isDeep ? 16 : 8; - - Span allPixels = image.GetPixelSpan(); - - using (IPixelCollection magickPixels = magickImage.GetPixelsUnsafe()) - { - if (isDeep) - { - ushort[] data = new ushort[allPixels.Length * 4]; - Span dataSpan = MemoryMarshal.Cast(data); - PixelOperations.Instance.ToRgba64(allPixels, dataSpan, allPixels.Length); - magickPixels.SetPixels(data); - } - else - { - byte[] data = new byte[allPixels.Length * 4]; - PixelOperations.Instance.ToRgba32Bytes(allPixels, data, allPixels.Length); - magickPixels.SetPixels(data); - } - } - - magickImage.Write(stream, this.Format); - } - } - } -} \ No newline at end of file diff --git a/tests/ImageSharp.Tests/TestUtilities/Tests/MagickReferenceCodecTests.cs b/tests/ImageSharp.Tests/TestUtilities/Tests/MagickReferenceCodecTests.cs index a797fca0e7..db651886f2 100644 --- a/tests/ImageSharp.Tests/TestUtilities/Tests/MagickReferenceCodecTests.cs +++ b/tests/ImageSharp.Tests/TestUtilities/Tests/MagickReferenceCodecTests.cs @@ -1,7 +1,6 @@ // Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. -using ImageMagick; using Xunit; // ReSharper disable InconsistentNaming @@ -86,21 +85,5 @@ namespace SixLabors.ImageSharp.Tests.TestUtilities.Tests } } } - - [Theory] - [WithTestPatternImages(100, 100, PixelTypesToTest32, MagickFormat.Png)] - [WithTestPatternImages(100, 100, PixelTypesToTest32, MagickFormat.Jpg)] - public void MagickEncode_8BitDepthImage(TestImageProvider provider, MagickFormat format) - where TPixel : struct, IPixel - { - string extension = format.ToString().ToLower(); - - var encoder = new MagickReferenceEncoder(format); - - using (Image image = provider.GetImage()) - { - image.VerifyEncoder(provider, extension, $"{format}", encoder, referenceDecoder: new SystemDrawingReferenceDecoder()); - } - } } } \ No newline at end of file