diff --git a/src/ImageSharp/PixelFormats/PixelBlenderMode.cs b/src/ImageSharp/PixelFormats/PixelBlenderMode.cs
index 7541be789..4b8f56d76 100644
--- a/src/ImageSharp/PixelFormats/PixelBlenderMode.cs
+++ b/src/ImageSharp/PixelFormats/PixelBlenderMode.cs
@@ -26,7 +26,7 @@ namespace SixLabors.ImageSharp.PixelFormats
///
/// Blends the 2 values by subtraction.
///
- Substract,
+ Subtract,
///
/// Multiplies the complements of the backdrop and source values, then complements the result.
diff --git a/src/ImageSharp/PixelFormats/PixelOperations{TPixel}.PixelBenders.cs b/src/ImageSharp/PixelFormats/PixelOperations{TPixel}.PixelBenders.cs
index 154ec7373..2c225ba4c 100644
--- a/src/ImageSharp/PixelFormats/PixelOperations{TPixel}.PixelBenders.cs
+++ b/src/ImageSharp/PixelFormats/PixelOperations{TPixel}.PixelBenders.cs
@@ -22,7 +22,7 @@ namespace SixLabors.ImageSharp.PixelFormats
{
case PixelBlenderMode.Multiply: return DefaultPixelBlenders.Multiply.Instance;
case PixelBlenderMode.Add: return DefaultPixelBlenders.Add.Instance;
- case PixelBlenderMode.Substract: return DefaultPixelBlenders.Substract.Instance;
+ case PixelBlenderMode.Subtract: return DefaultPixelBlenders.Subtract.Instance;
case PixelBlenderMode.Screen: return DefaultPixelBlenders.Screen.Instance;
case PixelBlenderMode.Darken: return DefaultPixelBlenders.Darken.Instance;
case PixelBlenderMode.Lighten: return DefaultPixelBlenders.Lighten.Instance;
diff --git a/tests/ImageSharp.Tests/Drawing/DrawImageTest.cs b/tests/ImageSharp.Tests/Drawing/DrawImageTest.cs
index 3e7f3648f..0ff0b8557 100644
--- a/tests/ImageSharp.Tests/Drawing/DrawImageTest.cs
+++ b/tests/ImageSharp.Tests/Drawing/DrawImageTest.cs
@@ -28,7 +28,7 @@ namespace SixLabors.ImageSharp.Tests
[WithFileCollection(nameof(TestFiles), PixelTypes, PixelBlenderMode.Normal)]
[WithFileCollection(nameof(TestFiles), PixelTypes, PixelBlenderMode.Multiply)]
[WithFileCollection(nameof(TestFiles), PixelTypes, PixelBlenderMode.Add)]
- [WithFileCollection(nameof(TestFiles), PixelTypes, PixelBlenderMode.Substract)]
+ [WithFileCollection(nameof(TestFiles), PixelTypes, PixelBlenderMode.Subtract)]
[WithFileCollection(nameof(TestFiles), PixelTypes, PixelBlenderMode.Screen)]
[WithFileCollection(nameof(TestFiles), PixelTypes, PixelBlenderMode.Darken)]
[WithFileCollection(nameof(TestFiles), PixelTypes, PixelBlenderMode.Lighten)]
diff --git a/tests/ImageSharp.Tests/PixelFormats/PixelBlenders/PorterDuffCompositorTests.cs b/tests/ImageSharp.Tests/PixelFormats/PixelBlenders/PorterDuffCompositorTests.cs
new file mode 100644
index 000000000..90b963f5c
--- /dev/null
+++ b/tests/ImageSharp.Tests/PixelFormats/PixelBlenders/PorterDuffCompositorTests.cs
@@ -0,0 +1,52 @@
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Processing;
+using SixLabors.ImageSharp.Processing.Drawing;
+
+using Xunit;
+
+namespace SixLabors.ImageSharp.Tests.PixelFormats.PixelBlenders
+{
+ public class PorterDuffCompositorTests
+ {
+ // TODO: Add other modes to compare.
+ private static PixelBlenderMode[] CompositingOperators =
+ {
+ PixelBlenderMode.Src,
+ PixelBlenderMode.Atop,
+ PixelBlenderMode.Over,
+ PixelBlenderMode.In,
+ PixelBlenderMode.Out,
+ PixelBlenderMode.Dest,
+ PixelBlenderMode.DestAtop,
+ PixelBlenderMode.DestOver,
+ PixelBlenderMode.DestIn,
+ PixelBlenderMode.DestOut,
+ PixelBlenderMode.Clear,
+ PixelBlenderMode.Xor
+ };
+
+ [Fact]
+ public void PorterDuffOutputIsCorrect()
+ {
+ string path = TestEnvironment.CreateOutputDirectory("PorterDuff");
+ var srcFile = TestFile.Create(TestImages.Png.PDSrc);
+ var destFile = TestFile.Create(TestImages.Png.PDDest);
+
+ using (Image src = srcFile.CreateImage())
+ using (Image dest = destFile.CreateImage())
+ {
+ foreach (PixelBlenderMode m in CompositingOperators)
+ {
+ using (Image res = dest.Clone(x => x.Blend(src, new GraphicsOptions { BlenderMode = m })))
+ {
+ // TODO: Generate reference files once this works.
+ res.Save($"{path}/{m}.png");
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/tests/ImageSharp.Tests/PixelFormats/PixelBlenders/PorterDuffFunctionsTests_TPixel.cs b/tests/ImageSharp.Tests/PixelFormats/PixelBlenders/PorterDuffFunctionsTests_TPixel.cs
index d77c42086..10a34ec31 100644
--- a/tests/ImageSharp.Tests/PixelFormats/PixelBlenders/PorterDuffFunctionsTests_TPixel.cs
+++ b/tests/ImageSharp.Tests/PixelFormats/PixelBlenders/PorterDuffFunctionsTests_TPixel.cs
@@ -160,7 +160,7 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats.PixelBlenders
public void SubstractFunction_Blender(TestPixel back, TestPixel source, float amount, TestPixel expected)
where TPixel : struct, IPixel
{
- TPixel actual = new DefaultPixelBlenders.Substract().Blend(back, source, amount);
+ TPixel actual = new DefaultPixelBlenders.Subtract().Blend(back, source, amount);
VectorAssert.Equal(expected, actual, 2);
}
@@ -170,7 +170,7 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats.PixelBlenders
where TPixel : struct, IPixel
{
Span dest = new Span(new TPixel[1]);
- new DefaultPixelBlenders.Substract().Blend(this.MemoryManager, dest, back.AsSpan(), source.AsSpan(), AsSpan(amount));
+ new DefaultPixelBlenders.Subtract().Blend(this.MemoryManager, dest, back.AsSpan(), source.AsSpan(), AsSpan(amount));
VectorAssert.Equal(expected, dest[0], 2);
}
diff --git a/tests/ImageSharp.Tests/PixelFormats/PixelOperationsTests.Blender.cs b/tests/ImageSharp.Tests/PixelFormats/PixelOperationsTests.Blender.cs
index 524747afe..d3956ecd5 100644
--- a/tests/ImageSharp.Tests/PixelFormats/PixelOperationsTests.Blender.cs
+++ b/tests/ImageSharp.Tests/PixelFormats/PixelOperationsTests.Blender.cs
@@ -16,53 +16,53 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats
public static TheoryData BlenderMappings = new TheoryData()
- {
- { new TestPixel(), typeof(DefaultPixelBlenders.Normal), PixelBlenderMode.Normal },
- { new TestPixel(), typeof(DefaultPixelBlenders.Screen), PixelBlenderMode.Screen },
- { new TestPixel(), typeof(DefaultPixelBlenders.HardLight), PixelBlenderMode.HardLight },
- { new TestPixel(), typeof(DefaultPixelBlenders.Overlay), PixelBlenderMode.Overlay },
- { new TestPixel(), typeof(DefaultPixelBlenders.Darken), PixelBlenderMode.Darken },
- { new TestPixel(), typeof(DefaultPixelBlenders.Lighten), PixelBlenderMode.Lighten },
- { new TestPixel(), typeof(DefaultPixelBlenders.Add), PixelBlenderMode.Add },
- { new TestPixel(), typeof(DefaultPixelBlenders.Substract), PixelBlenderMode.Substract },
- { new TestPixel(), typeof(DefaultPixelBlenders.Multiply), PixelBlenderMode.Multiply },
+ {
+ { new TestPixel(), typeof(DefaultPixelBlenders.Normal), PixelBlenderMode.Normal },
+ { new TestPixel(), typeof(DefaultPixelBlenders.Screen), PixelBlenderMode.Screen },
+ { new TestPixel(), typeof(DefaultPixelBlenders.HardLight), PixelBlenderMode.HardLight },
+ { new TestPixel(), typeof(DefaultPixelBlenders.Overlay), PixelBlenderMode.Overlay },
+ { new TestPixel(), typeof(DefaultPixelBlenders.Darken), PixelBlenderMode.Darken },
+ { new TestPixel(), typeof(DefaultPixelBlenders.Lighten), PixelBlenderMode.Lighten },
+ { new TestPixel(), typeof(DefaultPixelBlenders.Add), PixelBlenderMode.Add },
+ { new TestPixel(), typeof(DefaultPixelBlenders.Subtract), PixelBlenderMode.Subtract },
+ { new TestPixel(), typeof(DefaultPixelBlenders.Multiply), PixelBlenderMode.Multiply },
- { new TestPixel(), typeof(DefaultPixelBlenders.Src), PixelBlenderMode.Src },
- { new TestPixel(), typeof(DefaultPixelBlenders.Atop), PixelBlenderMode.Atop },
- { new TestPixel(), typeof(DefaultPixelBlenders.Over), PixelBlenderMode.Over },
- { new TestPixel(), typeof(DefaultPixelBlenders.In), PixelBlenderMode.In },
- { new TestPixel(), typeof(DefaultPixelBlenders.Out), PixelBlenderMode.Out },
- { new TestPixel(), typeof(DefaultPixelBlenders.Dest), PixelBlenderMode.Dest },
- { new TestPixel(), typeof(DefaultPixelBlenders.DestAtop), PixelBlenderMode.DestAtop },
- { new TestPixel(), typeof(DefaultPixelBlenders.DestOver), PixelBlenderMode.DestOver },
- { new TestPixel(), typeof(DefaultPixelBlenders.DestIn), PixelBlenderMode.DestIn },
- { new TestPixel(), typeof(DefaultPixelBlenders.DestOut), PixelBlenderMode.DestOut },
- { new TestPixel(), typeof(DefaultPixelBlenders.Clear), PixelBlenderMode.Clear },
- { new TestPixel(), typeof(DefaultPixelBlenders.Xor), PixelBlenderMode.Xor },
+ { new TestPixel(), typeof(DefaultPixelBlenders.Src), PixelBlenderMode.Src },
+ { new TestPixel(), typeof(DefaultPixelBlenders.Atop), PixelBlenderMode.Atop },
+ { new TestPixel(), typeof(DefaultPixelBlenders.Over), PixelBlenderMode.Over },
+ { new TestPixel(), typeof(DefaultPixelBlenders.In), PixelBlenderMode.In },
+ { new TestPixel(), typeof(DefaultPixelBlenders.Out), PixelBlenderMode.Out },
+ { new TestPixel(), typeof(DefaultPixelBlenders.Dest), PixelBlenderMode.Dest },
+ { new TestPixel(), typeof(DefaultPixelBlenders.DestAtop), PixelBlenderMode.DestAtop },
+ { new TestPixel(), typeof(DefaultPixelBlenders.DestOver), PixelBlenderMode.DestOver },
+ { new TestPixel(), typeof(DefaultPixelBlenders.DestIn), PixelBlenderMode.DestIn },
+ { new TestPixel(), typeof(DefaultPixelBlenders.DestOut), PixelBlenderMode.DestOut },
+ { new TestPixel(), typeof(DefaultPixelBlenders.Clear), PixelBlenderMode.Clear },
+ { new TestPixel(), typeof(DefaultPixelBlenders.Xor), PixelBlenderMode.Xor },
- { new TestPixel(), typeof(DefaultPixelBlenders.Normal), PixelBlenderMode.Normal },
- { new TestPixel(), typeof(DefaultPixelBlenders.Screen), PixelBlenderMode.Screen },
- { new TestPixel(), typeof(DefaultPixelBlenders.HardLight), PixelBlenderMode.HardLight },
- { new TestPixel(), typeof(DefaultPixelBlenders.Overlay), PixelBlenderMode.Overlay },
- { new TestPixel(), typeof(DefaultPixelBlenders.Darken), PixelBlenderMode.Darken },
- { new TestPixel(), typeof(DefaultPixelBlenders.Lighten), PixelBlenderMode.Lighten },
- { new TestPixel(), typeof(DefaultPixelBlenders.Add), PixelBlenderMode.Add },
- { new TestPixel(), typeof(DefaultPixelBlenders.Substract), PixelBlenderMode.Substract },
- { new TestPixel(), typeof(DefaultPixelBlenders.Multiply), PixelBlenderMode.Multiply },
- { new TestPixel(), typeof(DefaultPixelBlenders.Src), PixelBlenderMode.Src },
- { new TestPixel(), typeof(DefaultPixelBlenders.Atop), PixelBlenderMode.Atop },
- { new TestPixel(), typeof(DefaultPixelBlenders.Over), PixelBlenderMode.Over },
- { new TestPixel(), typeof(DefaultPixelBlenders.In), PixelBlenderMode.In },
- { new TestPixel(), typeof(DefaultPixelBlenders.Out), PixelBlenderMode.Out },
- { new TestPixel(), typeof(DefaultPixelBlenders.Dest), PixelBlenderMode.Dest },
- { new TestPixel(), typeof(DefaultPixelBlenders.DestAtop), PixelBlenderMode.DestAtop },
- { new TestPixel(), typeof(DefaultPixelBlenders.DestOver), PixelBlenderMode.DestOver },
- { new TestPixel(), typeof(DefaultPixelBlenders.DestIn), PixelBlenderMode.DestIn },
- { new TestPixel(), typeof(DefaultPixelBlenders.DestOut), PixelBlenderMode.DestOut },
- { new TestPixel(), typeof(DefaultPixelBlenders.Clear), PixelBlenderMode.Clear },
- { new TestPixel(), typeof(DefaultPixelBlenders.Xor), PixelBlenderMode.Xor },
+ { new TestPixel(), typeof(DefaultPixelBlenders.Normal), PixelBlenderMode.Normal },
+ { new TestPixel(), typeof(DefaultPixelBlenders.Screen), PixelBlenderMode.Screen },
+ { new TestPixel(), typeof(DefaultPixelBlenders.HardLight), PixelBlenderMode.HardLight },
+ { new TestPixel(), typeof(DefaultPixelBlenders.Overlay), PixelBlenderMode.Overlay },
+ { new TestPixel(), typeof(DefaultPixelBlenders.Darken), PixelBlenderMode.Darken },
+ { new TestPixel(), typeof(DefaultPixelBlenders.Lighten), PixelBlenderMode.Lighten },
+ { new TestPixel(), typeof(DefaultPixelBlenders.Add), PixelBlenderMode.Add },
+ { new TestPixel(), typeof(DefaultPixelBlenders.Subtract), PixelBlenderMode.Subtract },
+ { new TestPixel(), typeof(DefaultPixelBlenders.Multiply), PixelBlenderMode.Multiply },
+ { new TestPixel(), typeof(DefaultPixelBlenders.Src), PixelBlenderMode.Src },
+ { new TestPixel(), typeof(DefaultPixelBlenders.Atop), PixelBlenderMode.Atop },
+ { new TestPixel(), typeof(DefaultPixelBlenders.Over), PixelBlenderMode.Over },
+ { new TestPixel(), typeof(DefaultPixelBlenders.In), PixelBlenderMode.In },
+ { new TestPixel(), typeof(DefaultPixelBlenders.Out), PixelBlenderMode.Out },
+ { new TestPixel(), typeof(DefaultPixelBlenders.Dest), PixelBlenderMode.Dest },
+ { new TestPixel(), typeof(DefaultPixelBlenders.DestAtop), PixelBlenderMode.DestAtop },
+ { new TestPixel(), typeof(DefaultPixelBlenders.DestOver), PixelBlenderMode.DestOver },
+ { new TestPixel(), typeof(DefaultPixelBlenders.DestIn), PixelBlenderMode.DestIn },
+ { new TestPixel(), typeof(DefaultPixelBlenders.DestOut), PixelBlenderMode.DestOut },
+ { new TestPixel(), typeof(DefaultPixelBlenders.Clear), PixelBlenderMode.Clear },
+ { new TestPixel(), typeof(DefaultPixelBlenders.Xor), PixelBlenderMode.Xor },
- };
+ };
[Theory]
[MemberData(nameof(BlenderMappings))]
diff --git a/tests/ImageSharp.Tests/TestImages.cs b/tests/ImageSharp.Tests/TestImages.cs
index db469f87e..4e9c3192d 100644
--- a/tests/ImageSharp.Tests/TestImages.cs
+++ b/tests/ImageSharp.Tests/TestImages.cs
@@ -36,6 +36,8 @@ namespace SixLabors.ImageSharp.Tests
public const string SnakeGame = "Png/SnakeGame.png";
public const string Icon = "Png/icon.png";
public const string Kaboom = "Png/kaboom.png";
+ public const string PDSrc = "Png/pd-source.png";
+ public const string PDDest = "Png/pd-dest.png";
// Filtered test images from http://www.schaik.com/pngsuite/pngsuite_fil_png.html
public const string Filter0 = "Png/filter0.png";
diff --git a/tests/Images/Input/Png/pd-dest.png b/tests/Images/Input/Png/pd-dest.png
new file mode 100644
index 000000000..b9f1019aa
--- /dev/null
+++ b/tests/Images/Input/Png/pd-dest.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:adb9f4448b7bb44d7b4c0ad8c2f3f71b17acb05148375663c7a203707f08660d
+size 2563
diff --git a/tests/Images/Input/Png/pd-source.png b/tests/Images/Input/Png/pd-source.png
new file mode 100644
index 000000000..5cfc140f4
--- /dev/null
+++ b/tests/Images/Input/Png/pd-source.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dbf4a45b89eddeb727e0437846bcef5d875f532f94aaa441c75c8c3ddbac5150
+size 2393