Refactor ColorMatrixFilter

Former-commit-id: c86755bb2a957a100ef1386057016a9aba9afa69
Former-commit-id: 4dd7c9371541ce54016f58ec3f1ab246f6da540d
Former-commit-id: 07f91010fa4789a27c313f8ca74c0bd8709bab74

src/ImageProcessor/Filters/ColorMatrix/BlackWhite.cs

@@ -15,7 +15,7 @@ namespace ImageProcessor.Filters
         /// <summary>
         /// The BlackWhite matrix.
         /// </summary>
-        private static readonly Matrix4x4 Matrix = new Matrix4x4()
+        private static readonly Matrix4x4 ColorMatrix = new Matrix4x4()
         {
             M11 = 1.5f,
             M12 = 1.5f,
@@ -35,7 +35,7 @@ namespace ImageProcessor.Filters
         /// Initializes a new instance of the <see cref="BlackWhite"/> class.
         /// </summary>
         public BlackWhite()
-            : base(Matrix)
+            : base(ColorMatrix)
         {
         }
     }

src/ImageProcessor/Filters/ColorMatrix/ColorMatrixFilter.cs

@@ -11,7 +11,7 @@ namespace ImageProcessor.Filters
     /// <summary>
     /// The color matrix filter.
     /// </summary>
-    public class ColorMatrixFilter : ParallelImageProcessor
+    public class ColorMatrixFilter : ParallelImageProcessor, IColorMatrixFilter
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="ColorMatrixFilter"/> class.
@@ -26,13 +26,11 @@ namespace ImageProcessor.Filters
         /// <param name="matrix">The <see cref="Matrix4x4"/> to apply.</param>
         public ColorMatrixFilter(Matrix4x4 matrix)
         {
-            this.Value = matrix;
+            this.Matrix = matrix;
         }
 
-        /// <summary>
-        /// Gets or sets the matrix value.
-        /// </summary>
-        public Matrix4x4 Value { get; set; }
+        /// <inheritdoc/>
+        public Matrix4x4 Matrix { get; set; }
 
         /// <inheritdoc/>
         protected override void Apply(ImageBase target, ImageBase source, Rectangle targetRectangle, Rectangle sourceRectangle, int startY, int endY)
@@ -41,7 +39,7 @@ namespace ImageProcessor.Filters
             int sourceBottom = sourceRectangle.Bottom;
             int startX = sourceRectangle.X;
             int endX = sourceRectangle.Right;
-            Matrix4x4 matrix = this.Value;
+            Matrix4x4 matrix = this.Matrix;
 
             Parallel.For(
                 startY,

src/ImageProcessor/Filters/ColorMatrix/GreyscaleBt601.cs

@@ -16,7 +16,7 @@ namespace ImageProcessor.Filters
         /// <summary>
         /// The greyscale matrix.
         /// </summary>
-        private static readonly Matrix4x4 Matrix = new Matrix4x4()
+        private static readonly Matrix4x4 ColorMatrix = new Matrix4x4()
         {
             M11 = .299f,
             M12 = .299f,
@@ -33,7 +33,7 @@ namespace ImageProcessor.Filters
         /// Initializes a new instance of the <see cref="GreyscaleBt601"/> class.
         /// </summary>
         public GreyscaleBt601()
-            : base(Matrix)
+            : base(ColorMatrix)
         {
         }
     }

src/ImageProcessor/Filters/ColorMatrix/GreyscaleBt709.cs

@@ -16,7 +16,7 @@ namespace ImageProcessor.Filters
         /// <summary>
         /// The greyscale matrix.
         /// </summary>
-        private static readonly Matrix4x4 Matrix = new Matrix4x4()
+        private static readonly Matrix4x4 ColorMatrix = new Matrix4x4()
         {
             M11 = .2126f,
             M12 = .2126f,
@@ -33,7 +33,7 @@ namespace ImageProcessor.Filters
         /// Initializes a new instance of the <see cref="GreyscaleBt709"/> class.
         /// </summary>
         public GreyscaleBt709()
-            : base(Matrix)
+            : base(ColorMatrix)
         {
         }
     }

src/ImageProcessor/Filters/ColorMatrix/IColorMatrixFilter.cs

@@ -0,0 +1,21 @@
+// <copyright file="IColorMatrixFilter.cs" company="James South">
+// Copyright (c) James South and contributors.
+// Licensed under the Apache License, Version 2.0.
+// </copyright>
+
+namespace ImageProcessor.Filters
+{
+    using System.Numerics;
+
+    /// <summary>
+    /// Encapsulates properties and methods for creating processors that utilize a matrix to
+    /// alter the image pixels.
+    /// </summary>
+    public interface IColorMatrixFilter
+    {
+        /// <summary>
+        /// Gets the <see cref="Matrix4x4"/> used to alter the image.
+        /// </summary>
+        Matrix4x4 Matrix { get; }
+    }
+}

src/ImageProcessor/Filters/ColorMatrix/Kodachrome.cs

@@ -15,7 +15,7 @@ namespace ImageProcessor.Filters
         /// <summary>
         /// The Kodachrome matrix. Purely artistic in composition.
         /// </summary>
-        private static readonly Matrix4x4 Matrix = new Matrix4x4()
+        private static readonly Matrix4x4 ColorMatrix = new Matrix4x4()
         {
             M11 = 0.6997023f,
             M22 = 0.4609577f,
@@ -29,7 +29,7 @@ namespace ImageProcessor.Filters
         /// Initializes a new instance of the <see cref="Kodachrome"/> class.
         /// </summary>
         public Kodachrome()
-            : base(Matrix)
+            : base(ColorMatrix)
         {
         }
     }

src/ImageProcessor/Filters/ColorMatrix/Lomograph.cs

@@ -15,7 +15,7 @@ namespace ImageProcessor.Filters
         /// <summary>
         /// The Lomograph matrix. Purely artistic in composition.
         /// </summary>
-        private static readonly Matrix4x4 Matrix = new Matrix4x4()
+        private static readonly Matrix4x4 ColorMatrix = new Matrix4x4()
         {
             M11 = 1.5f,
             M22 = 1.45f,
@@ -29,7 +29,7 @@ namespace ImageProcessor.Filters
         /// Initializes a new instance of the <see cref="Lomograph"/> class.
         /// </summary>
         public Lomograph()
-            : base(Matrix)
+            : base(ColorMatrix)
         {
         }
     }

src/ImageProcessor/Filters/ColorMatrix/Polaroid.cs

@@ -14,9 +14,8 @@ namespace ImageProcessor.Filters
     {
         /// <summary>
         /// The Polaroid matrix. Purely artistic in composition.
-        /// TODO: Calculate a matrix that works in the linear color space.
         /// </summary>
-        private static readonly Matrix4x4 Matrix = new Matrix4x4()
+        private static readonly Matrix4x4 ColorMatrix = new Matrix4x4()
         {
             M11 = 1.538f,
             M12 = -0.062f,
@@ -36,7 +35,7 @@ namespace ImageProcessor.Filters
         /// Initializes a new instance of the <see cref="Polaroid"/> class.
         /// </summary>
         public Polaroid()
-            : base(Matrix)
+            : base(ColorMatrix)
         {
         }
     }

src/ImageProcessor/Filters/ColorMatrix/Saturation.cs

@@ -50,7 +50,7 @@ namespace ImageProcessor.Filters
                 M33 = saturationComplementB + saturationFactor,
             };
 
-            this.Value = matrix;
+            this.Matrix = matrix;
         }
     }
 }

src/ImageProcessor/Filters/ColorMatrix/Sepia.cs

@@ -15,7 +15,7 @@ namespace ImageProcessor.Filters
         /// <summary>
         /// The sepia matrix.
         /// </summary>
-        private static readonly Matrix4x4 Matrix = new Matrix4x4()
+        private static readonly Matrix4x4 ColorMatrix = new Matrix4x4()
         {
             M11 = .393f,
             M12 = .349f,
@@ -32,7 +32,7 @@ namespace ImageProcessor.Filters
         /// Initializes a new instance of the <see cref="Sepia"/> class.
         /// </summary>
         public Sepia()
-            : base(Matrix)
+            : base(ColorMatrix)
         {
         }
     }

src/ImageProcessor/Settings.StyleCop

@@ -18,6 +18,7 @@
       <Value>lomograph</Value>
       <Value>polaroid</Value>
       <Value>colorspace</Value>
+      <Value>kodachrome</Value>
     </CollectionProperty>
   </GlobalSettings>
 </StyleCopSettings>

tests/ImageProcessor.Tests/Processors/Filters/FilterTests.cs

@@ -12,22 +12,22 @@ namespace ImageProcessor.Tests
     {
         public static readonly TheoryData<string, IImageProcessor> Filters = new TheoryData<string, IImageProcessor>
         {
-            //{ "Brightness-50", new Brightness(50) },
-            //{ "Brightness--50", new Brightness(-50) },
-            //{ "Contrast-50", new Contrast(50) },
-            //{ "Contrast--50", new Contrast(-50) },
-            //{ "Blend", new Blend(new Image(File.OpenRead("../../TestImages/Formats/Bmp/Car.bmp")),15)},
-            //{ "Saturation-50", new Saturation(50) },
-            //{ "Saturation--50", new Saturation(-50) },
-            //{ "Alpha--50", new Alpha(50) },
-            //{ "Invert", new Invert() },
-            //{ "Sepia", new Sepia() },
-            //{ "BlackWhite", new BlackWhite() },
-            //{ "Lomograph", new Lomograph() },
-            //{ "Polaroid", new Polaroid() },
-            //{ "Kodachrome", new Kodachrome() },
-            //{ "GreyscaleBt709", new GreyscaleBt709() },
-            //{ "GreyscaleBt601", new GreyscaleBt601() },`
+            { "Brightness-50", new Brightness(50) },
+            { "Brightness--50", new Brightness(-50) },
+            { "Contrast-50", new Contrast(50) },
+            { "Contrast--50", new Contrast(-50) },
+            { "Blend", new Blend(new Image(File.OpenRead("../../TestImages/Formats/Bmp/Car.bmp")),15)},
+            { "Saturation-50", new Saturation(50) },
+            { "Saturation--50", new Saturation(-50) },
+            { "Alpha--50", new Alpha(50) },
+            { "Invert", new Invert() },
+            { "Sepia", new Sepia() },
+            { "BlackWhite", new BlackWhite() },
+            { "Lomograph", new Lomograph() },
+            { "Polaroid", new Polaroid() },
+            { "Kodachrome", new Kodachrome() },
+            { "GreyscaleBt709", new GreyscaleBt709() },
+            { "GreyscaleBt601", new GreyscaleBt601() },
             { "Kayyali", new Kayyali() },
             { "Kirsch", new Kirsch() },
             { "Laplacian3X3", new Laplacian3X3() },

tests/ImageProcessor.Tests/Processors/ProcessorTestBase.cs

@@ -19,20 +19,20 @@ namespace ImageProcessor.Tests
         /// </summary>
         public static readonly List<string> Files = new List<string>
         {
-            //"../../TestImages/Formats/Jpg/Backdrop.jpg",
+            "../../TestImages/Formats/Jpg/Backdrop.jpg",
             "../../TestImages/Formats/Jpg/Calliphora.jpg",
             "../../TestImages/Formats/Jpg/lomo.jpg",
             "../../TestImages/Formats/Jpg/shaftesbury.jpg",
-            //"../../TestImages/Formats/Jpg/gamma_dalai_lama_gray.jpg",
-            //"../../TestImages/Formats/Jpg/greyscale.jpg",
-            //"../../TestImages/Formats/Bmp/Car.bmp",
-            //"../../TestImages/Formats/Png/cmyk.png",
-            //"../../TestImages/Formats/Png/gamma-1.0-or-2.2.png",
-            //"../../TestImages/Formats/Png/splash.png",
-            //"../../TestImages/Formats/Gif/leaf.gif",
-            //"../../TestImages/Formats/Gif/rings.gif",
-            //"../../TestImages/Formats/Gif/ani2.gif",
-            //"../../TestImages/Formats/Gif/giphy.gif"
+            "../../TestImages/Formats/Jpg/gamma_dalai_lama_gray.jpg",
+            "../../TestImages/Formats/Jpg/greyscale.jpg",
+            "../../TestImages/Formats/Bmp/Car.bmp",
+            "../../TestImages/Formats/Png/cmyk.png",
+            "../../TestImages/Formats/Png/gamma-1.0-or-2.2.png",
+            "../../TestImages/Formats/Png/splash.png",
+            "../../TestImages/Formats/Gif/leaf.gif",
+            "../../TestImages/Formats/Gif/rings.gif",
+            "../../TestImages/Formats/Gif/ani2.gif",
+            "../../TestImages/Formats/Gif/giphy.gif"
         };
     }
 }