From a8fdb13f2a1e1f0ab370aed70c088a71826ab0d7 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 26 Dec 2019 11:27:21 +0100
Subject: [PATCH] Added support for custom pixel modifiers

---
 .../Effects/PixelShaderProcessor.cs           | 24 +++++++++++++++++++
 .../Effects/PixelShaderProcessorBase.cs       | 13 +++++++---
 .../Effects/PixelShaderProcessor{TPixel}.cs   |  2 +-
 .../PositionAwarePixelShaderProcessor.cs      | 24 +++++++++++++++++++
 ...sitionAwarePixelShaderProcessor{TPixel}.cs |  2 +-
 5 files changed, 60 insertions(+), 5 deletions(-)

diff --git a/src/ImageSharp/Processing/Processors/Effects/PixelShaderProcessor.cs b/src/ImageSharp/Processing/Processors/Effects/PixelShaderProcessor.cs
index 6c44199da..2a271bef3 100644
--- a/src/ImageSharp/Processing/Processors/Effects/PixelShaderProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Effects/PixelShaderProcessor.cs
@@ -11,6 +11,11 @@ namespace SixLabors.ImageSharp.Processing.Processors.Effects
     /// </summary>
     public sealed class PixelShaderProcessor : IImageProcessor
     {
+        /// <summary>
+        /// The default <see cref="PixelConversionModifiers"/> to apply during the pixel conversions.
+        /// </summary>
+        public const PixelConversionModifiers DefaultModifiers = PixelConversionModifiers.None;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="PixelShaderProcessor"/> class.
         /// </summary>
@@ -20,6 +25,20 @@ namespace SixLabors.ImageSharp.Processing.Processors.Effects
         public PixelShaderProcessor(PixelShader pixelShader)
         {
             this.PixelShader = pixelShader;
+            this.Modifiers = DefaultModifiers;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PixelShaderProcessor"/> class.
+        /// </summary>
+        /// <param name="pixelShader">
+        /// The user defined pixel shader to use to modify images.
+        /// </param>
+        /// <param name="modifiers">The <see cref="PixelConversionModifiers"/> to apply during the pixel conversions.</param>
+        public PixelShaderProcessor(PixelShader pixelShader, PixelConversionModifiers modifiers)
+        {
+            this.PixelShader = pixelShader;
+            this.Modifiers = modifiers;
         }
 
         /// <summary>
@@ -27,6 +46,11 @@ namespace SixLabors.ImageSharp.Processing.Processors.Effects
         /// </summary>
         public PixelShader PixelShader { get; }
 
+        /// <summary>
+        /// Gets the <see cref="PixelConversionModifiers"/> to apply during the pixel conversions.
+        /// </summary>
+        public PixelConversionModifiers Modifiers { get; }
+
         /// <inheritdoc />
         public IImageProcessor<TPixel> CreatePixelSpecificProcessor<TPixel>(Image<TPixel> source, Rectangle sourceRectangle)
             where TPixel : struct, IPixel<TPixel>
diff --git a/src/ImageSharp/Processing/Processors/Effects/PixelShaderProcessorBase.cs b/src/ImageSharp/Processing/Processors/Effects/PixelShaderProcessorBase.cs
index a8e032ee1..f1245ca51 100644
--- a/src/ImageSharp/Processing/Processors/Effects/PixelShaderProcessorBase.cs
+++ b/src/ImageSharp/Processing/Processors/Effects/PixelShaderProcessorBase.cs
@@ -18,14 +18,21 @@ namespace SixLabors.ImageSharp.Processing.Processors.Effects
     internal abstract class PixelShaderProcessorBase<TPixel> : ImageProcessor<TPixel>
         where TPixel : struct, IPixel<TPixel>
     {
+        /// <summary>
+        /// The <see cref="PixelConversionModifiers"/> to apply during the pixel conversions.
+        /// </summary>
+        private readonly PixelConversionModifiers modifiers;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="PixelShaderProcessorBase{TPixel}"/> class.
         /// </summary>
+        /// <param name="modifiers">The <see cref="PixelConversionModifiers"/> to apply during the pixel conversions.</param>
         /// <param name="source">The source <see cref="Image{TPixel}"/> for the current processor instance.</param>
         /// <param name="sourceRectangle">The source area to process for the current processor instance.</param>
-        protected PixelShaderProcessorBase(Image<TPixel> source, Rectangle sourceRectangle)
+        protected PixelShaderProcessorBase(PixelConversionModifiers modifiers, Image<TPixel> source, Rectangle sourceRectangle)
             : base(source, sourceRectangle)
         {
+            this.modifiers = modifiers;
         }
 
         /// <inheritdoc/>
@@ -44,12 +51,12 @@ namespace SixLabors.ImageSharp.Processing.Processors.Effects
                         Span<Vector4> vectorSpan = vectorBuffer.Span;
                         int length = vectorSpan.Length;
                         Span<TPixel> rowSpan = source.GetPixelRowSpan(y).Slice(startX, length);
-                        PixelOperations<TPixel>.Instance.ToVector4(this.Configuration, rowSpan, vectorSpan);
+                        PixelOperations<TPixel>.Instance.ToVector4(this.Configuration, rowSpan, vectorSpan, this.modifiers);
 
                         // Run the user defined pixel shader on the current row of pixels
                         this.ApplyPixelShader(vectorSpan, y, startX);
 
-                        PixelOperations<TPixel>.Instance.FromVector4Destructive(this.Configuration, vectorSpan, rowSpan);
+                        PixelOperations<TPixel>.Instance.FromVector4Destructive(this.Configuration, vectorSpan, rowSpan, this.modifiers);
                     }
                 });
         }
diff --git a/src/ImageSharp/Processing/Processors/Effects/PixelShaderProcessor{TPixel}.cs b/src/ImageSharp/Processing/Processors/Effects/PixelShaderProcessor{TPixel}.cs
index 29e3ab5a9..4abd69838 100644
--- a/src/ImageSharp/Processing/Processors/Effects/PixelShaderProcessor{TPixel}.cs
+++ b/src/ImageSharp/Processing/Processors/Effects/PixelShaderProcessor{TPixel}.cs
@@ -28,7 +28,7 @@ namespace SixLabors.ImageSharp.Processing.Processors.Effects
         /// <param name="source">The source <see cref="Image{TPixel}"/> for the current processor instance.</param>
         /// <param name="sourceRectangle">The source area to process for the current processor instance.</param>
         public PixelShaderProcessor(PixelShaderProcessor definition, Image<TPixel> source, Rectangle sourceRectangle)
-            : base(source, sourceRectangle)
+            : base(definition.Modifiers, source, sourceRectangle)
         {
             this.pixelShader = definition.PixelShader;
         }
diff --git a/src/ImageSharp/Processing/Processors/Effects/PositionAwarePixelShaderProcessor.cs b/src/ImageSharp/Processing/Processors/Effects/PositionAwarePixelShaderProcessor.cs
index a83e8b5a4..908f7472b 100644
--- a/src/ImageSharp/Processing/Processors/Effects/PositionAwarePixelShaderProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Effects/PositionAwarePixelShaderProcessor.cs
@@ -11,6 +11,11 @@ namespace SixLabors.ImageSharp.Processing.Processors.Effects
     /// </summary>
     public sealed class PositionAwarePixelShaderProcessor : IImageProcessor
     {
+        /// <summary>
+        /// The default <see cref="PixelConversionModifiers"/> to apply during the pixel conversions.
+        /// </summary>
+        public const PixelConversionModifiers DefaultModifiers = PixelConversionModifiers.None;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="PositionAwarePixelShaderProcessor"/> class.
         /// </summary>
@@ -20,6 +25,20 @@ namespace SixLabors.ImageSharp.Processing.Processors.Effects
         public PositionAwarePixelShaderProcessor(PositionAwarePixelShader pixelShader)
         {
             this.PixelShader = pixelShader;
+            this.Modifiers = DefaultModifiers;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PositionAwarePixelShaderProcessor"/> class.
+        /// </summary>
+        /// <param name="pixelShader">
+        /// The user defined pixel shader to use to modify images.
+        /// </param>
+        /// <param name="modifiers">The <see cref="PixelConversionModifiers"/> to apply during the pixel conversions.</param>
+        public PositionAwarePixelShaderProcessor(PositionAwarePixelShader pixelShader, PixelConversionModifiers modifiers)
+        {
+            this.PixelShader = pixelShader;
+            this.Modifiers = modifiers;
         }
 
         /// <summary>
@@ -27,6 +46,11 @@ namespace SixLabors.ImageSharp.Processing.Processors.Effects
         /// </summary>
         public PositionAwarePixelShader PixelShader { get; }
 
+        /// <summary>
+        /// Gets the <see cref="PixelConversionModifiers"/> to apply during the pixel conversions.
+        /// </summary>
+        public PixelConversionModifiers Modifiers { get; }
+
         /// <inheritdoc />
         public IImageProcessor<TPixel> CreatePixelSpecificProcessor<TPixel>(Image<TPixel> source, Rectangle sourceRectangle)
             where TPixel : struct, IPixel<TPixel>
diff --git a/src/ImageSharp/Processing/Processors/Effects/PositionAwarePixelShaderProcessor{TPixel}.cs b/src/ImageSharp/Processing/Processors/Effects/PositionAwarePixelShaderProcessor{TPixel}.cs
index 6c4eee35f..3b9f37b48 100644
--- a/src/ImageSharp/Processing/Processors/Effects/PositionAwarePixelShaderProcessor{TPixel}.cs
+++ b/src/ImageSharp/Processing/Processors/Effects/PositionAwarePixelShaderProcessor{TPixel}.cs
@@ -28,7 +28,7 @@ namespace SixLabors.ImageSharp.Processing.Processors.Effects
         /// <param name="source">The source <see cref="Image{TPixel}"/> for the current processor instance.</param>
         /// <param name="sourceRectangle">The source area to process for the current processor instance.</param>
         public PositionAwarePixelShaderProcessor(PositionAwarePixelShaderProcessor definition, Image<TPixel> source, Rectangle sourceRectangle)
-            : base(source, sourceRectangle)
+            : base(definition.Modifiers, source, sourceRectangle)
         {
             this.pixelShader = definition.PixelShader;
         }