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

---
 src/ImageSharp/Common/Helpers/ImageMaths.cs | 25 +++++++++------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/ImageSharp/Common/Helpers/ImageMaths.cs b/src/ImageSharp/Common/Helpers/ImageMaths.cs
index 6c8c62039..9c4dee503 100644
--- a/src/ImageSharp/Common/Helpers/ImageMaths.cs
+++ b/src/ImageSharp/Common/Helpers/ImageMaths.cs
@@ -157,10 +157,10 @@ namespace ImageSharp
         {
             int width = bitmap.Width;
             int height = bitmap.Height;
-            Point topLeft = default(Point);
-            Point bottomRight = default(Point);
+            var topLeft = default(Point);
+            var bottomRight = default(Point);
 
-            Func<PixelAccessor<TPixel>, int, int, float, bool> delegateFunc;
+            Func<ImageBase<TPixel>, int, int, float, bool> delegateFunc;
 
             // Determine which channel to check against
             switch (channel)
@@ -182,7 +182,7 @@ namespace ImageSharp
                     break;
             }
 
-            int GetMinY(PixelAccessor<TPixel> pixels)
+            int GetMinY(ImageBase<TPixel> pixels)
             {
                 for (int y = 0; y < height; y++)
                 {
@@ -198,7 +198,7 @@ namespace ImageSharp
                 return 0;
             }
 
-            int GetMaxY(PixelAccessor<TPixel> pixels)
+            int GetMaxY(ImageBase<TPixel> pixels)
             {
                 for (int y = height - 1; y > -1; y--)
                 {
@@ -214,7 +214,7 @@ namespace ImageSharp
                 return height;
             }
 
-            int GetMinX(PixelAccessor<TPixel> pixels)
+            int GetMinX(ImageBase<TPixel> pixels)
             {
                 for (int x = 0; x < width; x++)
                 {
@@ -230,7 +230,7 @@ namespace ImageSharp
                 return 0;
             }
 
-            int GetMaxX(PixelAccessor<TPixel> pixels)
+            int GetMaxX(ImageBase<TPixel> pixels)
             {
                 for (int x = width - 1; x > -1; x--)
                 {
@@ -246,13 +246,10 @@ namespace ImageSharp
                 return height;
             }
 
-            using (PixelAccessor<TPixel> bitmapPixels = bitmap.Lock())
-            {
-                topLeft.Y = GetMinY(bitmapPixels);
-                topLeft.X = GetMinX(bitmapPixels);
-                bottomRight.Y = (GetMaxY(bitmapPixels) + 1).Clamp(0, height);
-                bottomRight.X = (GetMaxX(bitmapPixels) + 1).Clamp(0, width);
-            }
+            topLeft.Y = GetMinY(bitmap);
+            topLeft.X = GetMinX(bitmap);
+            bottomRight.Y = (GetMaxY(bitmap) + 1).Clamp(0, height);
+            bottomRight.X = (GetMaxX(bitmap) + 1).Clamp(0, width);
 
             return GetBoundingRectangle(topLeft, bottomRight);
         }