From 1791e1af95fe4285e4e932c7623701b966bc42df Mon Sep 17 00:00:00 2001 From: Anton Firszov Date: Tue, 26 Jun 2018 01:58:41 +0200 Subject: [PATCH] ImageMagick decoder works --- .../ImageSharp.Tests/ImageSharp.Tests.csproj | 1 + .../ReferenceCodecs/MagickReferenceDecoder.cs | 51 +++++++++ .../ReferenceCodecs/MagickReferenceEncoder.cs | 60 ++++++++++ .../TestUtilities/TestImageExtensions.cs | 6 +- .../Tests/MagickReferenceCodecTests.cs | 106 ++++++++++++++++++ ...cs => SystemDrawingReferenceCodecTests.cs} | 10 +- 6 files changed, 228 insertions(+), 6 deletions(-) create mode 100644 tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/MagickReferenceDecoder.cs create mode 100644 tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/MagickReferenceEncoder.cs create mode 100644 tests/ImageSharp.Tests/TestUtilities/Tests/MagickReferenceCodecTests.cs rename tests/ImageSharp.Tests/TestUtilities/Tests/{ReferenceCodecTests.cs => SystemDrawingReferenceCodecTests.cs} (94%) diff --git a/tests/ImageSharp.Tests/ImageSharp.Tests.csproj b/tests/ImageSharp.Tests/ImageSharp.Tests.csproj index e7e2577a8..9e15b6aba 100644 --- a/tests/ImageSharp.Tests/ImageSharp.Tests.csproj +++ b/tests/ImageSharp.Tests/ImageSharp.Tests.csproj @@ -27,6 +27,7 @@ + diff --git a/tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/MagickReferenceDecoder.cs b/tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/MagickReferenceDecoder.cs new file mode 100644 index 000000000..9b209137b --- /dev/null +++ b/tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/MagickReferenceDecoder.cs @@ -0,0 +1,51 @@ +// Copyright (c) Six Labors and contributors. +// Licensed under the Apache License, Version 2.0. + +using System; +using System.IO; +using System.Runtime.InteropServices; + +using ImageMagick; + +using SixLabors.ImageSharp.Advanced; +using SixLabors.ImageSharp.Formats; +using SixLabors.ImageSharp.PixelFormats; + +namespace SixLabors.ImageSharp.Tests.TestUtilities.ReferenceCodecs +{ + public class MagickReferenceDecoder : IImageDecoder + { + public Image Decode(Configuration configuration, Stream stream) + where TPixel : struct, IPixel + { + using (var magickImage = new MagickImage(stream)) + { + var result = new Image(configuration, magickImage.Width, magickImage.Height); + Span resultPixels = result.GetPixelSpan(); + + using (IPixelCollection pixels = magickImage.GetPixelsUnsafe()) + { + if (magickImage.Depth == 8) + { + byte[] data = pixels.ToByteArray("RGBA"); + + PixelOperations.Instance.PackFromRgba32Bytes(data, resultPixels, resultPixels.Length); + } + else if (magickImage.Depth == 16) + { + ushort[] data = pixels.ToShortArray("RGBA"); + Span bytes = MemoryMarshal.Cast(data.AsSpan()); + + PixelOperations.Instance.PackFromRgba64Bytes(bytes, resultPixels, resultPixels.Length); + } + else + { + throw new NotImplementedException(); + } + } + + return result; + } + } + } +} \ No newline at end of file diff --git a/tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/MagickReferenceEncoder.cs b/tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/MagickReferenceEncoder.cs new file mode 100644 index 000000000..97e4a55a4 --- /dev/null +++ b/tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/MagickReferenceEncoder.cs @@ -0,0 +1,60 @@ +// 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() > 32; + + 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/TestImageExtensions.cs b/tests/ImageSharp.Tests/TestUtilities/TestImageExtensions.cs index 016ae7ad2..79a0071ff 100644 --- a/tests/ImageSharp.Tests/TestUtilities/TestImageExtensions.cs +++ b/tests/ImageSharp.Tests/TestUtilities/TestImageExtensions.cs @@ -641,7 +641,8 @@ namespace SixLabors.ImageSharp.Tests IImageEncoder encoder, ImageComparer customComparer = null, bool appendPixelTypeToFileName = true, - string referenceImageExtension = null) + string referenceImageExtension = null, + IImageDecoder referenceDecoder = null) where TPixel : struct, IPixel { string actualOutputFile = provider.Utility.SaveTestOutputFile( @@ -650,7 +651,8 @@ namespace SixLabors.ImageSharp.Tests encoder, testOutputDetails, appendPixelTypeToFileName); - IImageDecoder referenceDecoder = TestEnvironment.GetReferenceDecoder(actualOutputFile); + + referenceDecoder = referenceDecoder ?? TestEnvironment.GetReferenceDecoder(actualOutputFile); using (var actualImage = Image.Load(actualOutputFile, referenceDecoder)) { diff --git a/tests/ImageSharp.Tests/TestUtilities/Tests/MagickReferenceCodecTests.cs b/tests/ImageSharp.Tests/TestUtilities/Tests/MagickReferenceCodecTests.cs new file mode 100644 index 000000000..a797fca0e --- /dev/null +++ b/tests/ImageSharp.Tests/TestUtilities/Tests/MagickReferenceCodecTests.cs @@ -0,0 +1,106 @@ +// Copyright (c) Six Labors and contributors. +// Licensed under the Apache License, Version 2.0. + +using ImageMagick; +using Xunit; +// ReSharper disable InconsistentNaming + +namespace SixLabors.ImageSharp.Tests.TestUtilities.Tests +{ + using SixLabors.ImageSharp.PixelFormats; + using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison; + using SixLabors.ImageSharp.Tests.TestUtilities.ReferenceCodecs; + + using Xunit.Abstractions; + + public class MagickReferenceCodecTests + { + public MagickReferenceCodecTests(ITestOutputHelper output) + { + this.Output = output; + } + + private ITestOutputHelper Output { get; } + + public const PixelTypes PixelTypesToTest32 = PixelTypes.Rgba32 | PixelTypes.Bgra32 | PixelTypes.Rgb24; + + public const PixelTypes PixelTypesToTest64 = + PixelTypes.Rgba32 | PixelTypes.Rgb24 | PixelTypes.Rgba64 | PixelTypes.Rgb48; + + public const PixelTypes PixelTypesToTest48 = + PixelTypes.Rgba32 | PixelTypes.Rgba64 | PixelTypes.Rgb48; + + [Theory] + [WithBlankImages(1, 1, PixelTypesToTest32, TestImages.Png.Splash)] + [WithBlankImages(1, 1, PixelTypesToTest32, TestImages.Png.Indexed)] + public void MagickDecode_8BitDepthImage_IsEquivalentTo_SystemDrawingResult(TestImageProvider dummyProvider, string testImage) + where TPixel : struct, IPixel + { + string path = TestFile.GetInputFileFullPath(testImage); + + var magickDecoder = new MagickReferenceDecoder(); + var sdDecoder = new SystemDrawingReferenceDecoder(); + + ImageComparer comparer = ImageComparer.Exact; + + using (var mImage = Image.Load(path, magickDecoder)) + using (var sdImage = Image.Load(path, sdDecoder)) + { + ImageSimilarityReport report = comparer.CompareImagesOrFrames(mImage, sdImage); + + mImage.DebugSave(dummyProvider); + + if (TestEnvironment.IsWindows) + { + Assert.True(report.IsEmpty); + } + } + } + + [Theory] + [WithBlankImages(1, 1, PixelTypesToTest64, TestImages.Png.Rgba64Bpp)] + [WithBlankImages(1, 1, PixelTypesToTest48, TestImages.Png.Rgb48Bpp)] + [WithBlankImages(1, 1, PixelTypesToTest48, TestImages.Png.Rgb48BppInterlaced)] + [WithBlankImages(1, 1, PixelTypesToTest48, TestImages.Png.Rgb48BppTrans)] + public void MagickDecode_16BitDepthImage_IsApproximatelyEquivalentTo_SystemDrawingResult(TestImageProvider dummyProvider, string testImage) + where TPixel : struct, IPixel + { + string path = TestFile.GetInputFileFullPath(testImage); + + var magickDecoder = new MagickReferenceDecoder(); + var sdDecoder = new SystemDrawingReferenceDecoder(); + + // 1020 == 4 * 255 (Equivalent to manhattan distance of 1+1+1+1=4 in Rgba32 space) + var comparer = ImageComparer.TolerantPercentage(1, 1020); + + using (var mImage = Image.Load(path, magickDecoder)) + using (var sdImage = Image.Load(path, sdDecoder)) + { + ImageSimilarityReport report = comparer.CompareImagesOrFrames(mImage, sdImage); + + mImage.DebugSave(dummyProvider); + + if (TestEnvironment.IsWindows) + { + Assert.True(report.IsEmpty); + } + } + } + + [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 diff --git a/tests/ImageSharp.Tests/TestUtilities/Tests/ReferenceCodecTests.cs b/tests/ImageSharp.Tests/TestUtilities/Tests/SystemDrawingReferenceCodecTests.cs similarity index 94% rename from tests/ImageSharp.Tests/TestUtilities/Tests/ReferenceCodecTests.cs rename to tests/ImageSharp.Tests/TestUtilities/Tests/SystemDrawingReferenceCodecTests.cs index 3ad595b7e..3cdb67dbd 100644 --- a/tests/ImageSharp.Tests/TestUtilities/Tests/ReferenceCodecTests.cs +++ b/tests/ImageSharp.Tests/TestUtilities/Tests/SystemDrawingReferenceCodecTests.cs @@ -1,4 +1,6 @@ -using System.IO; +// Copyright (c) Six Labors and contributors. +// Licensed under the Apache License, Version 2.0. + using SixLabors.ImageSharp.Formats.Png; using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.Processing; @@ -8,13 +10,13 @@ using SixLabors.ImageSharp.Tests.TestUtilities.ReferenceCodecs; using Xunit; using Xunit.Abstractions; -namespace SixLabors.ImageSharp.Tests +namespace SixLabors.ImageSharp.Tests.TestUtilities.Tests { - public class ReferenceCodecTests + public class SystemDrawingReferenceCodecTests { private ITestOutputHelper Output { get; } - public ReferenceCodecTests(ITestOutputHelper output) + public SystemDrawingReferenceCodecTests(ITestOutputHelper output) { this.Output = output; }