From dfbf5536aeef9b01ecec3d520748e5cfdaaeb4d7 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Wed, 18 Jul 2018 11:53:35 +1000
Subject: [PATCH] Fix git merge

---
 src/ImageSharp/Memory/AllocationOptions.cs                    | 2 +-
 .../Normalization/HistogramEqualizationProcessor.cs           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/ImageSharp/Memory/AllocationOptions.cs b/src/ImageSharp/Memory/AllocationOptions.cs
index 737762717..5eda00505 100644
--- a/src/ImageSharp/Memory/AllocationOptions.cs
+++ b/src/ImageSharp/Memory/AllocationOptions.cs
@@ -14,7 +14,7 @@ namespace SixLabors.Memory
         None,
 
         /// <summary>
-        /// Indicates that the allocated buffer should be cleaned.
+        /// Indicates that the allocated buffer should be cleaned following allocation.
         /// </summary>
         Clean
     }
diff --git a/src/ImageSharp/Processing/Processors/Normalization/HistogramEqualizationProcessor.cs b/src/ImageSharp/Processing/Processors/Normalization/HistogramEqualizationProcessor.cs
index ba56e392f..b834b8968 100644
--- a/src/ImageSharp/Processing/Processors/Normalization/HistogramEqualizationProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Normalization/HistogramEqualizationProcessor.cs
@@ -43,8 +43,8 @@ namespace SixLabors.ImageSharp.Processing.Processors.Normalization
             Span<TPixel> pixels = source.GetPixelSpan();
 
             // Build the histogram of the grayscale levels.
-            using (IBuffer<int> histogramBuffer = memoryAllocator.AllocateClean<int>(this.LuminanceLevels))
-            using (IBuffer<int> cdfBuffer = memoryAllocator.AllocateClean<int>(this.LuminanceLevels))
+            using (IBuffer<int> histogramBuffer = memoryAllocator.Allocate<int>(this.LuminanceLevels, AllocationOptions.Clean))
+            using (IBuffer<int> cdfBuffer = memoryAllocator.Allocate<int>(this.LuminanceLevels, AllocationOptions.Clean))
             {
                 Span<int> histogram = histogramBuffer.GetSpan();
                 for (int i = 0; i < pixels.Length; i++)