From 40bb95aa62c64900371820fdec22041f44ceff41 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Wed, 24 May 2017 14:15:57 +1000
Subject: [PATCH] Optimize Contrast

---
 .../Processors/Effects/ContrastProcessor.cs   | 45 +++++++++----------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/src/ImageSharp/Processing/Processors/Effects/ContrastProcessor.cs b/src/ImageSharp/Processing/Processors/Effects/ContrastProcessor.cs
index 8308c57e2..f5dc68545 100644
--- a/src/ImageSharp/Processing/Processors/Effects/ContrastProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Effects/ContrastProcessor.cs
@@ -45,8 +45,8 @@ namespace ImageSharp.Processing.Processors
             int endY = sourceRectangle.Bottom;
             int startX = sourceRectangle.X;
             int endX = sourceRectangle.Right;
-            Vector4 contrastVector = new Vector4(contrast, contrast, contrast, 1);
-            Vector4 shiftVector = new Vector4(.5F, .5F, .5F, 1);
+            var contrastVector = new Vector4(contrast, contrast, contrast, 1);
+            var shiftVector = new Vector4(.5F, .5F, .5F, 1);
 
             // Align start/end positions.
             int minX = Math.Max(0, startX);
@@ -65,29 +65,28 @@ namespace ImageSharp.Processing.Processors
                 startY = 0;
             }
 
-            using (PixelAccessor<TPixel> sourcePixels = source.Lock())
-            {
-                Parallel.For(
-                    minY,
-                    maxY,
-                    this.ParallelOptions,
-                    y =>
+            Parallel.For(
+                minY,
+                maxY,
+                this.ParallelOptions,
+                y =>
+                    {
+                        int offsetY = y - startY;
+                        Span<TPixel> row = source.GetRowSpan(y - startY);
+
+                        for (int x = minX; x < maxX; x++)
                         {
-                            int offsetY = y - startY;
-                            for (int x = minX; x < maxX; x++)
-                            {
-                                int offsetX = x - startX;
+                            int offsetX = x - startX;
+                            ref TPixel pixel = ref row[x - startX];
 
-                                Vector4 vector = sourcePixels[offsetX, offsetY].ToVector4().Expand();
-                                vector -= shiftVector;
-                                vector *= contrastVector;
-                                vector += shiftVector;
-                                TPixel packed = default(TPixel);
-                                packed.PackFromVector4(vector.Compress());
-                                sourcePixels[offsetX, offsetY] = packed;
-                            }
-                        });
-            }
+                            Vector4 vector = pixel.ToVector4().Expand();
+                            vector -= shiftVector;
+                            vector *= contrastVector;
+                            vector += shiftVector;
+
+                            pixel.PackFromVector4(vector.Compress());
+                        }
+                    });
         }
     }
 }
\ No newline at end of file