diff --git a/Avalonia.sln b/Avalonia.sln
index ea30514c3e..c8e513f94c 100644
--- a/Avalonia.sln
+++ b/Avalonia.sln
@@ -99,7 +99,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Props", "Props", "{F3AC8BC1
build\HarfBuzzSharp.props = build\HarfBuzzSharp.props
build\JetBrains.Annotations.props = build\JetBrains.Annotations.props
build\JetBrains.dotMemoryUnit.props = build\JetBrains.dotMemoryUnit.props
- build\Magick.NET-Q16-AnyCPU.props = build\Magick.NET-Q16-AnyCPU.props
build\Microsoft.CSharp.props = build\Microsoft.CSharp.props
build\Microsoft.Reactive.Testing.props = build\Microsoft.Reactive.Testing.props
build\Moq.props = build\Moq.props
@@ -118,6 +117,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Props", "Props", "{F3AC8BC1
build\System.Memory.props = build\System.Memory.props
build\UnitTests.NetFX.props = build\UnitTests.NetFX.props
build\XUnit.props = build\XUnit.props
+ build\ImageSharp.props = build\ImageSharp.props
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Targets", "Targets", "{4D6FAF79-58B4-482F-9122-0668C346364C}"
diff --git a/build/Magick.NET-Q16-AnyCPU.props b/build/ImageSharp.props
similarity index 63%
rename from build/Magick.NET-Q16-AnyCPU.props
rename to build/ImageSharp.props
index 21d9cdcb1f..178c274ac9 100644
--- a/build/Magick.NET-Q16-AnyCPU.props
+++ b/build/ImageSharp.props
@@ -1,5 +1,5 @@
-
+
diff --git a/tests/Avalonia.Direct2D1.RenderTests/Avalonia.Direct2D1.RenderTests.csproj b/tests/Avalonia.Direct2D1.RenderTests/Avalonia.Direct2D1.RenderTests.csproj
index e7f1552370..52acc78db1 100644
--- a/tests/Avalonia.Direct2D1.RenderTests/Avalonia.Direct2D1.RenderTests.csproj
+++ b/tests/Avalonia.Direct2D1.RenderTests/Avalonia.Direct2D1.RenderTests.csproj
@@ -19,6 +19,6 @@
-
+
diff --git a/tests/Avalonia.RenderTests/TestBase.cs b/tests/Avalonia.RenderTests/TestBase.cs
index b70c721085..523876500f 100644
--- a/tests/Avalonia.RenderTests/TestBase.cs
+++ b/tests/Avalonia.RenderTests/TestBase.cs
@@ -1,10 +1,9 @@
using System.IO;
using System.Runtime.CompilerServices;
-using ImageMagick;
using Avalonia.Controls;
using Avalonia.Media.Imaging;
using Avalonia.Rendering;
-
+using SixLabors.ImageSharp;
using Xunit;
using Avalonia.Platform;
using System.Threading.Tasks;
@@ -12,6 +11,8 @@ using System;
using System.Threading;
using Avalonia.Media;
using Avalonia.Threading;
+using SixLabors.ImageSharp.PixelFormats;
+using Image = SixLabors.ImageSharp.Image;
#if AVALONIA_SKIA
using Avalonia.Skia;
#else
@@ -119,12 +120,12 @@ namespace Avalonia.Direct2D1.RenderTests
var immediatePath = Path.Combine(OutputPath, testName + ".immediate.out.png");
var deferredPath = Path.Combine(OutputPath, testName + ".deferred.out.png");
- using (var expected = new MagickImage(expectedPath))
- using (var immediate = new MagickImage(immediatePath))
- using (var deferred = new MagickImage(deferredPath))
+ using (var expected = Image.Load(expectedPath))
+ using (var immediate = Image.Load(immediatePath))
+ using (var deferred = Image.Load(deferredPath))
{
- double immediateError = expected.Compare(immediate, ErrorMetric.RootMeanSquared);
- double deferredError = expected.Compare(deferred, ErrorMetric.RootMeanSquared);
+ var immediateError = CompareImages(immediate, expected);
+ var deferredError = CompareImages(deferred, expected);
if (immediateError > 0.022)
{
@@ -143,10 +144,10 @@ namespace Avalonia.Direct2D1.RenderTests
var expectedPath = Path.Combine(OutputPath, testName + ".expected.png");
var actualPath = Path.Combine(OutputPath, testName + ".out.png");
- using (var expected = new MagickImage(expectedPath))
- using (var actual = new MagickImage(actualPath))
+ using (var expected = Image.Load(expectedPath))
+ using (var actual = Image.Load(actualPath))
{
- double immediateError = expected.Compare(actual, ErrorMetric.RootMeanSquared);
+ double immediateError = CompareImages(actual, expected);
if (immediateError > 0.022)
{
@@ -154,6 +155,53 @@ namespace Avalonia.Direct2D1.RenderTests
}
}
}
+
+ ///
+ /// Calculates root mean square error for given two images.
+ /// Based roughly on ImageMagick implementation to ensure consistency.
+ ///
+ private static double CompareImages(Image actual, Image expected)
+ {
+ if (actual.Width != expected.Width || actual.Height != expected.Height)
+ {
+ throw new ArgumentException("Images have different resolutions");
+ }
+
+ var quantity = actual.Width * actual.Height;
+ double squaresError = 0;
+
+ const double scale = 1 / 255d;
+
+ for (var x = 0; x < actual.Width; x++)
+ {
+ double localError = 0;
+
+ for (var y = 0; y < actual.Height; y++)
+ {
+ var expectedAlpha = expected[x, y].A * scale;
+ var actualAlpha = actual[x, y].A * scale;
+
+ var r = scale * (expectedAlpha * expected[x, y].R - actualAlpha * actual[x, y].R);
+ var g = scale * (expectedAlpha * expected[x, y].G - actualAlpha * actual[x, y].G);
+ var b = scale * (expectedAlpha * expected[x, y].B - actualAlpha * actual[x, y].B);
+ var a = expectedAlpha - actualAlpha;
+
+ var error = r * r + g * g + b * b + a * a;
+
+ localError += error;
+ }
+
+ squaresError += localError;
+ }
+
+ var meanSquaresError = squaresError / quantity;
+
+ const int channelCount = 4;
+
+ meanSquaresError = meanSquaresError / channelCount;
+
+ return Math.Sqrt(meanSquaresError);
+ }
private string GetTestsDirectory()
{
diff --git a/tests/Avalonia.Skia.RenderTests/Avalonia.Skia.RenderTests.csproj b/tests/Avalonia.Skia.RenderTests/Avalonia.Skia.RenderTests.csproj
index ffbcdd9e7c..d3f2b44968 100644
--- a/tests/Avalonia.Skia.RenderTests/Avalonia.Skia.RenderTests.csproj
+++ b/tests/Avalonia.Skia.RenderTests/Avalonia.Skia.RenderTests.csproj
@@ -20,7 +20,7 @@
-
+