From 7fd7f18a76aab3e830f628a6ce162bcd9da9550b Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Tue, 23 Jan 2018 12:23:16 +1100
Subject: [PATCH] Use premultiplication for convolution #428

---
 .../Common/Extensions/Vector4Extensions.cs    | 26 +++++++++++++++++++
 .../Convolution/Convolution2DProcessor.cs     |  4 +--
 .../Convolution/Convolution2PassProcessor.cs  |  4 +--
 .../Convolution/ConvolutionProcessor.cs       |  4 +--
 4 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/src/ImageSharp/Common/Extensions/Vector4Extensions.cs b/src/ImageSharp/Common/Extensions/Vector4Extensions.cs
index 7cb193e82..64ebeb1f3 100644
--- a/src/ImageSharp/Common/Extensions/Vector4Extensions.cs
+++ b/src/ImageSharp/Common/Extensions/Vector4Extensions.cs
@@ -12,6 +12,32 @@ namespace SixLabors.ImageSharp
     /// </summary>
     internal static class Vector4Extensions
     {
+        /// <summary>
+        /// Premultiplies the "x", "y", "z" components of a vector by its "w" component leaving the "w" component intact.
+        /// </summary>
+        /// <param name="source">The <see cref="Vector4"/> to premultiply</param>
+        /// <returns>The <see cref="Vector4"/></returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static Vector4 Premultiply(this Vector4 source)
+        {
+            float w = source.W;
+            Vector4 premultiplied = source * w;
+            return new Vector4(premultiplied.X, premultiplied.Y, premultiplied.Z, w);
+        }
+
+        /// <summary>
+        /// Reverses the result of premultiplying a vector via <see cref="Premultiply(Vector4)"/>.
+        /// </summary>
+        /// <param name="source">The <see cref="Vector4"/> to premultiply</param>
+        /// <returns>The <see cref="Vector4"/></returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static Vector4 UnPremultiply(this Vector4 source)
+        {
+            float w = source.W;
+            Vector4 unpremultiplied = source / w;
+            return new Vector4(unpremultiplied.X, unpremultiplied.Y, unpremultiplied.Z, w);
+        }
+
         /// <summary>
         /// Compresses a linear color signal to its sRGB equivalent.
         /// <see href="http://www.4p8.com/eric.brasseur/gamma.html#formulas"/>
diff --git a/src/ImageSharp/Processing/Processors/Convolution/Convolution2DProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/Convolution2DProcessor.cs
index b85432ac5..cf9b7be9c 100644
--- a/src/ImageSharp/Processing/Processors/Convolution/Convolution2DProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Convolution/Convolution2DProcessor.cs
@@ -93,7 +93,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
                                     int offsetX = x + fxr;
 
                                     offsetX = offsetX.Clamp(0, maxX);
-                                    var currentColor = sourceOffsetRow[offsetX].ToVector4();
+                                    Vector4 currentColor = sourceOffsetRow[offsetX].ToVector4().Premultiply();
 
                                     if (fy < kernelXHeight)
                                     {
@@ -118,7 +118,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
                             float blue = MathF.Sqrt((bX * bX) + (bY * bY));
 
                             ref TPixel pixel = ref targetRow[x];
-                            pixel.PackFromVector4(new Vector4(red, green, blue, sourceRow[x].ToVector4().W));
+                            pixel.PackFromVector4(new Vector4(red, green, blue, sourceRow[x].ToVector4().W).UnPremultiply());
                         }
                     });
 
diff --git a/src/ImageSharp/Processing/Processors/Convolution/Convolution2PassProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/Convolution2PassProcessor.cs
index 362fa5c50..57f434ee0 100644
--- a/src/ImageSharp/Processing/Processors/Convolution/Convolution2PassProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Convolution/Convolution2PassProcessor.cs
@@ -113,13 +113,13 @@ namespace SixLabors.ImageSharp.Processing.Processors
 
                                 offsetX = offsetX.Clamp(0, maxX);
 
-                                var currentColor = row[offsetX].ToVector4();
+                                Vector4 currentColor = row[offsetX].ToVector4().Premultiply();
                                 destination += kernel[fy, fx] * currentColor;
                             }
                         }
 
                         ref TPixel pixel = ref targetRow[x];
-                        pixel.PackFromVector4(destination);
+                        pixel.PackFromVector4(destination.UnPremultiply());
                     }
                 });
         }
diff --git a/src/ImageSharp/Processing/Processors/Convolution/ConvolutionProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/ConvolutionProcessor.cs
index c0d3fdcfe..96db9a4ce 100644
--- a/src/ImageSharp/Processing/Processors/Convolution/ConvolutionProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Convolution/ConvolutionProcessor.cs
@@ -80,7 +80,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
 
                                  offsetX = offsetX.Clamp(0, maxX);
 
-                                 var currentColor = sourceOffsetRow[offsetX].ToVector4();
+                                 Vector4 currentColor = sourceOffsetRow[offsetX].ToVector4().Premultiply();
                                  currentColor *= this.KernelXY[fy, fx];
 
                                  red += currentColor.X;
@@ -90,7 +90,7 @@ namespace SixLabors.ImageSharp.Processing.Processors
                          }
 
                          ref TPixel pixel = ref targetRow[x];
-                         pixel.PackFromVector4(new Vector4(red, green, blue, sourceRow[x].ToVector4().W));
+                         pixel.PackFromVector4(new Vector4(red, green, blue, sourceRow[x].ToVector4().W).UnPremultiply());
                      }
                  });