From 5a1569f499a314a5a8b321f519b0d50d0026a874 Mon Sep 17 00:00:00 2001
From: woutware <35376607+woutware@users.noreply.github.com>
Date: Sun, 29 Apr 2018 17:33:39 +0200
Subject: [PATCH 01/12] Added fast path for SolidBrush in FillProcessor.

---
 .../Drawing/Brushes/SolidBrush{TPixel}.cs     | 21 ++++--
 .../Drawing/Processors/FillProcessor.cs       | 66 ++++++++++++-------
 2 files changed, 57 insertions(+), 30 deletions(-)

diff --git a/src/ImageSharp.Drawing/Processing/Drawing/Brushes/SolidBrush{TPixel}.cs b/src/ImageSharp.Drawing/Processing/Drawing/Brushes/SolidBrush{TPixel}.cs
index 826f5f60a7..f2054ee0d7 100644
--- a/src/ImageSharp.Drawing/Processing/Drawing/Brushes/SolidBrush{TPixel}.cs
+++ b/src/ImageSharp.Drawing/Processing/Drawing/Brushes/SolidBrush{TPixel}.cs
@@ -90,16 +90,23 @@ internal override void Apply(Span<float> scanline, int x, int y)
 
                 MemoryManager memoryManager = this.Target.MemoryManager;
 
-                using (IBuffer<float> amountBuffer = memoryManager.Allocate<float>(scanline.Length))
+                if (this.Options.BlendPercentage == 1f)
                 {
-                    Span<float> amountSpan = amountBuffer.Span;
-
-                    for (int i = 0; i < scanline.Length; i++)
+                    this.Blender.Blend(memoryManager, destinationRow, destinationRow, this.Colors.Span, scanline);
+                }
+                else
+                {
+                    using (IBuffer<float> amountBuffer = memoryManager.Allocate<float>(scanline.Length))
                     {
-                        amountSpan[i] = scanline[i] * this.Options.BlendPercentage;
-                    }
+                        Span<float> amountSpan = amountBuffer.Span;
+
+                        for (int i = 0; i < scanline.Length; i++)
+                        {
+                            amountSpan[i] = scanline[i] * this.Options.BlendPercentage;
+                        }
 
-                    this.Blender.Blend(memoryManager, destinationRow, destinationRow, this.Colors.Span, amountSpan);
+                        this.Blender.Blend(memoryManager, destinationRow, destinationRow, this.Colors.Span, amountSpan);
+                    }
                 }
             }
         }
diff --git a/src/ImageSharp.Drawing/Processing/Drawing/Processors/FillProcessor.cs b/src/ImageSharp.Drawing/Processing/Drawing/Processors/FillProcessor.cs
index e4ef44564e..0ef7db419e 100644
--- a/src/ImageSharp.Drawing/Processing/Drawing/Processors/FillProcessor.cs
+++ b/src/ImageSharp.Drawing/Processing/Drawing/Processors/FillProcessor.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Threading.Tasks;
+using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing.Drawing.Brushes;
@@ -49,38 +50,57 @@ protected override void OnFrameApply(ImageFrame<TPixel> source, Rectangle source
             int minY = Math.Max(0, startY);
             int maxY = Math.Min(source.Height, endY);
 
-            // Reset offset if necessary.
-            if (minX > 0)
-            {
-                startX = 0;
-            }
-
-            if (minY > 0)
-            {
-                startY = 0;
-            }
-
             int width = maxX - minX;
 
-            using (IBuffer<float> amount = source.MemoryManager.Allocate<float>(width))
-            using (BrushApplicator<TPixel> applicator = this.brush.CreateApplicator(
-                source,
-                sourceRectangle,
-                this.options))
-            {
-                amount.Span.Fill(this.options.BlendPercentage);
+            var solidBrush = this.brush as SolidBrush<TPixel>;
 
+            // If there's no reason for blending, then avoid it.
+            if (solidBrush != null && this.options.BlendPercentage == 1f && solidBrush.Color.ToVector4().Z == 1f)
+            {
                 Parallel.For(
                     minY,
                     maxY,
                     configuration.ParallelOptions,
                     y =>
-                        {
-                            int offsetY = y - startY;
-                            int offsetX = minX - startX;
+                    {
+                        int offsetY = y - startY;
+                        int offsetX = minX - startX;
+                        source.GetPixelRowSpan(y).Slice(minX, width).Fill(solidBrush.Color);
+                    });
+            }
+            else
+            {
+                // Reset offset if necessary.
+                if (minX > 0)
+                {
+                    startX = 0;
+                }
+
+                if (minY > 0)
+                {
+                    startY = 0;
+                }
+
+                using (IBuffer<float> amount = source.MemoryManager.Allocate<float>(width))
+                using (BrushApplicator<TPixel> applicator = this.brush.CreateApplicator(
+                    source,
+                    sourceRectangle,
+                    this.options))
+                {
+                    amount.Span.Fill(this.options.BlendPercentage);
+
+                    Parallel.For(
+                        minY,
+                        maxY,
+                        configuration.ParallelOptions,
+                        y =>
+                            {
+                                int offsetY = y - startY;
+                                int offsetX = minX - startX;
 
-                            applicator.Apply(amount.Span, offsetX, offsetY);
-                        });
+                                applicator.Apply(amount.Span, offsetX, offsetY);
+                            });
+                }
             }
         }
     }

From 08b033c684c4d693310826dd1388c6da24ca12cf Mon Sep 17 00:00:00 2001
From: woutware <35376607+woutware@users.noreply.github.com>
Date: Sun, 29 Apr 2018 17:45:02 +0200
Subject: [PATCH 02/12] Oops, should be W instead of Z ofcourse.

---
 .../Processing/Drawing/Processors/FillProcessor.cs              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ImageSharp.Drawing/Processing/Drawing/Processors/FillProcessor.cs b/src/ImageSharp.Drawing/Processing/Drawing/Processors/FillProcessor.cs
index 0ef7db419e..c3addaf29f 100644
--- a/src/ImageSharp.Drawing/Processing/Drawing/Processors/FillProcessor.cs
+++ b/src/ImageSharp.Drawing/Processing/Drawing/Processors/FillProcessor.cs
@@ -55,7 +55,7 @@ protected override void OnFrameApply(ImageFrame<TPixel> source, Rectangle source
             var solidBrush = this.brush as SolidBrush<TPixel>;
 
             // If there's no reason for blending, then avoid it.
-            if (solidBrush != null && this.options.BlendPercentage == 1f && solidBrush.Color.ToVector4().Z == 1f)
+            if (solidBrush != null && this.options.BlendPercentage == 1f && solidBrush.Color.ToVector4().W == 1f)
             {
                 Parallel.For(
                     minY,

From 58384de0c7b884bd6f30fa495aba8a95217569d6 Mon Sep 17 00:00:00 2001
From: woutware <35376607+woutware@users.noreply.github.com>
Date: Sun, 29 Apr 2018 20:19:35 +0200
Subject: [PATCH 03/12] Add Image and ImageFrame constructors that take a clear
 color as parameter.

This is good for performance because this avoids first needing to clear the buffer with zeroes.
---
 src/ImageSharp/ImageFrameCollection.cs    | 20 ++++++++++--
 src/ImageSharp/Image{TPixel}.cs           | 40 +++++++++++++++++++++++
 src/ImageSharp/Memory/BufferExtensions.cs | 12 +++++++
 3 files changed, 70 insertions(+), 2 deletions(-)

diff --git a/src/ImageSharp/ImageFrameCollection.cs b/src/ImageSharp/ImageFrameCollection.cs
index a9225eec49..1c00d9e633 100644
--- a/src/ImageSharp/ImageFrameCollection.cs
+++ b/src/ImageSharp/ImageFrameCollection.cs
@@ -23,7 +23,14 @@ internal ImageFrameCollection(Image<TPixel> parent, int width, int height)
             this.parent = parent;
 
             // Frames are already cloned within the caller
-            this.frames.Add(new ImageFrame<TPixel>(parent.GetConfiguration().MemoryManager, width, height));
+            if (parent.ClearColor.HasValue)
+            {
+                this.frames.Add(new ImageFrame<TPixel>(parent.GetConfiguration(), width, height, parent.ClearColor.Value));
+            }
+            else
+            {
+                this.frames.Add(new ImageFrame<TPixel>(parent.GetConfiguration().MemoryManager, width, height));
+            }
         }
 
         internal ImageFrameCollection(Image<TPixel> parent, IEnumerable<ImageFrame<TPixel>> frames)
@@ -143,7 +150,16 @@ public Image<TPixel> CloneFrame(int index)
         /// <inheritdoc/>
         public ImageFrame<TPixel> CreateFrame()
         {
-            var frame = new ImageFrame<TPixel>(this.parent.GetConfiguration().MemoryManager, this.RootFrame.Width, this.RootFrame.Height);
+            ImageFrame<TPixel> frame;
+            if (this.parent.ClearColor.HasValue)
+            {
+                frame = new ImageFrame<TPixel>(this.parent.GetConfiguration(), this.RootFrame.Width, this.RootFrame.Height, this.parent.ClearColor.Value);
+            }
+            else
+            {
+                frame = new ImageFrame<TPixel>(this.parent.GetConfiguration().MemoryManager, this.RootFrame.Width, this.RootFrame.Height);
+            }
+
             this.frames.Add(frame);
             return frame;
         }
diff --git a/src/ImageSharp/Image{TPixel}.cs b/src/ImageSharp/Image{TPixel}.cs
index 78a091e414..2aa5038440 100644
--- a/src/ImageSharp/Image{TPixel}.cs
+++ b/src/ImageSharp/Image{TPixel}.cs
@@ -22,6 +22,7 @@ public sealed class Image<TPixel> : IImage, IConfigurable
     {
         private readonly Configuration configuration;
         private readonly ImageFrameCollection<TPixel> frames;
+        private readonly TPixel? clearColor;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="Image{TPixel}"/> class
@@ -37,6 +38,21 @@ public Image(Configuration configuration, int width, int height)
         {
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Image{TPixel}"/> class
+        /// with the height and the width of the image.
+        /// </summary>
+        /// <param name="configuration">
+        /// The configuration providing initialization code which allows extending the library.
+        /// </param>
+        /// <param name="width">The width of the image in pixels.</param>
+        /// <param name="height">The height of the image in pixels.</param>
+        /// <param name="clearColor">The color to initialize the pixels with.</param>
+        public Image(Configuration configuration, int width, int height, TPixel clearColor)
+            : this(configuration, width, height, clearColor, new ImageMetaData())
+        {
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="Image{TPixel}"/> class
         /// with the height and the width of the image.
@@ -66,6 +82,25 @@ internal Image(Configuration configuration, int width, int height, ImageMetaData
             this.frames = new ImageFrameCollection<TPixel>(this, width, height);
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Image{TPixel}"/> class
+        /// with the height and the width of the image.
+        /// </summary>
+        /// <param name="configuration">
+        /// The configuration providing initialization code which allows extending the library.
+        /// </param>
+        /// <param name="width">The width of the image in pixels.</param>
+        /// <param name="height">The height of the image in pixels.</param>
+        /// <param name="clearColor">The clear color.</param>
+        /// <param name="metadata">The images metadata.</param>
+        internal Image(Configuration configuration, int width, int height, TPixel clearColor, ImageMetaData metadata) {
+            this.configuration = configuration ?? Configuration.Default;
+            this.PixelType = new PixelTypeInfo(Unsafe.SizeOf<TPixel>() * 8);
+            this.MetaData = metadata ?? new ImageMetaData();
+            this.clearColor = clearColor;
+            this.frames = new ImageFrameCollection<TPixel>(this, width, height);
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="Image{TPixel}" /> class
         /// with the height and the width of the image.
@@ -104,6 +139,11 @@ internal Image(Configuration configuration, ImageMetaData metadata, IEnumerable<
         /// </summary>
         public IImageFrameCollection<TPixel> Frames => this.frames;
 
+        /// <summary>
+        /// Gets the clear color to initialize the image frame pixels with.
+        /// </summary>
+        internal TPixel? ClearColor => this.clearColor;
+
         /// <summary>
         /// Gets the root frame.
         /// </summary>
diff --git a/src/ImageSharp/Memory/BufferExtensions.cs b/src/ImageSharp/Memory/BufferExtensions.cs
index dd3114c21c..1347f28821 100644
--- a/src/ImageSharp/Memory/BufferExtensions.cs
+++ b/src/ImageSharp/Memory/BufferExtensions.cs
@@ -52,6 +52,18 @@ public static void Clear<T>(this IBuffer<T> buffer)
             buffer.Span.Clear();
         }
 
+        /// <summary>
+        /// Fills the contents of this buffer.
+        /// </summary>
+        /// <param name="buffer">The buffer</param>
+        /// <param name="value">The value to fill the buffer with.</param>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static void Fill<T>(this IBuffer<T> buffer, T value)
+            where T : struct
+        {
+            buffer.Span.Fill(value);
+        }
+
         public static ref T DangerousGetPinnableReference<T>(this IBuffer<T> buffer)
             where T : struct =>
             ref MemoryMarshal.GetReference(buffer.Span);

From 8995a738aa2e98acf8e52457a35af0ba3ac5bc55 Mon Sep 17 00:00:00 2001
From: woutware <35376607+woutware@users.noreply.github.com>
Date: Sun, 29 Apr 2018 21:36:03 +0200
Subject: [PATCH 04/12] Processed Scott's review comment.

---
 .../Drawing/Processors/FillProcessor.cs       |  6 ++++-
 .../PixelFormats/PixelBlenderMode.cs          | 24 +++++++++----------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/ImageSharp.Drawing/Processing/Drawing/Processors/FillProcessor.cs b/src/ImageSharp.Drawing/Processing/Drawing/Processors/FillProcessor.cs
index c3addaf29f..3417b8faaa 100644
--- a/src/ImageSharp.Drawing/Processing/Drawing/Processors/FillProcessor.cs
+++ b/src/ImageSharp.Drawing/Processing/Drawing/Processors/FillProcessor.cs
@@ -55,7 +55,11 @@ protected override void OnFrameApply(ImageFrame<TPixel> source, Rectangle source
             var solidBrush = this.brush as SolidBrush<TPixel>;
 
             // If there's no reason for blending, then avoid it.
-            if (solidBrush != null && this.options.BlendPercentage == 1f && solidBrush.Color.ToVector4().W == 1f)
+            if (solidBrush != null &&
+                (
+                    (this.options.BlenderMode == PixelBlenderMode.Normal && this.options.BlendPercentage == 1f && solidBrush.Color.ToVector4().W == 1f) ||
+                    (this.options.BlenderMode == PixelBlenderMode.Over && this.options.BlendPercentage == 1f && solidBrush.Color.ToVector4().W == 1f) ||
+                    (this.options.BlenderMode == PixelBlenderMode.Src)))
             {
                 Parallel.For(
                     minY,
diff --git a/src/ImageSharp/PixelFormats/PixelBlenderMode.cs b/src/ImageSharp/PixelFormats/PixelBlenderMode.cs
index 4b8f56d766..7a8ab6592a 100644
--- a/src/ImageSharp/PixelFormats/PixelBlenderMode.cs
+++ b/src/ImageSharp/PixelFormats/PixelBlenderMode.cs
@@ -54,62 +54,62 @@ public enum PixelBlenderMode
         HardLight,
 
         /// <summary>
-        /// returns the source colors
+        /// returns the source colors.
         /// </summary>
         Src,
 
         /// <summary>
-        /// returns the source over the destination
+        /// returns the source over the destination.
         /// </summary>
         Atop,
 
         /// <summary>
-        /// returns the detination over the source
+        /// returns the destination over the source.
         /// </summary>
         Over,
 
         /// <summary>
-        /// the source where the desitnation and source overlap
+        /// The source where the destination and source overlap.
         /// </summary>
         In,
 
         /// <summary>
-        /// the destination where the desitnation and source overlap
+        /// The destination where the destination and source overlap.
         /// </summary>
         Out,
 
         /// <summary>
-        /// the destination where the source does not overlap it
+        /// The destination where the source does not overlap it.
         /// </summary>
         Dest,
 
         /// <summary>
-        /// the source where they dont overlap othersie dest in overlapping parts
+        /// The source where they don't overlap othersie dest in overlapping parts.
         /// </summary>
         DestAtop,
 
         /// <summary>
-        /// the destnation over the source
+        /// The destination over the source.
         /// </summary>
         DestOver,
 
         /// <summary>
-        /// the destination where the desitnation and source overlap
+        /// The destination where the destination and source overlap.
         /// </summary>
         DestIn,
 
         /// <summary>
-        /// the source where the desitnation and source overlap
+        /// The source where the destination and source overlap.
         /// </summary>
         DestOut,
 
         /// <summary>
-        /// the clear.
+        /// The clear.
         /// </summary>
         Clear,
 
         /// <summary>
-        /// clear where they overlap
+        /// Clear where they overlap.
         /// </summary>
         Xor
     }

From 02fc4ef43b7834f4d0e7de927de0ec41a5725afe Mon Sep 17 00:00:00 2001
From: woutware <35376607+woutware@users.noreply.github.com>
Date: Sun, 29 Apr 2018 23:19:28 +0200
Subject: [PATCH 05/12] I think I forgot to commit this one.

---
 src/ImageSharp/ImageFrame{TPixel}.cs | 51 ++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/src/ImageSharp/ImageFrame{TPixel}.cs b/src/ImageSharp/ImageFrame{TPixel}.cs
index cf7a1ae4fc..cb15fe3db2 100644
--- a/src/ImageSharp/ImageFrame{TPixel}.cs
+++ b/src/ImageSharp/ImageFrame{TPixel}.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Numerics;
 using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.Memory;
@@ -52,6 +53,39 @@ internal ImageFrame(MemoryManager memoryManager, int width, int height, ImageFra
             this.MetaData = metaData;
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ImageFrame{TPixel}" /> class.
+        /// </summary>
+        /// <param name="configuration">The <see cref="Configuration"/> to use for buffer allocation and parallel options to clear the buffer with.</param>
+        /// <param name="width">The width of the image in pixels.</param>
+        /// <param name="height">The height of the image in pixels.</param>
+        /// <param name="clearColor">The color to clear the image with.</param>
+        internal ImageFrame(Configuration configuration, int width, int height, TPixel clearColor)
+            : this(configuration, width, height, clearColor, new ImageFrameMetaData())
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ImageFrame{TPixel}" /> class.
+        /// </summary>
+        /// <param name="configuration">The <see cref="Configuration"/> to use for buffer allocation and parallel options to clear the buffer with.</param>
+        /// <param name="width">The width of the image in pixels.</param>
+        /// <param name="height">The height of the image in pixels.</param>
+        /// <param name="clearColor">The color to clear the image with.</param>
+        /// <param name="metaData">The meta data.</param>
+        internal ImageFrame(Configuration configuration, int width, int height, TPixel clearColor, ImageFrameMetaData metaData)
+        {
+            Guard.NotNull(configuration, nameof(configuration));
+            Guard.MustBeGreaterThan(width, 0, nameof(width));
+            Guard.MustBeGreaterThan(height, 0, nameof(height));
+            Guard.NotNull(metaData, nameof(metaData));
+
+            this.MemoryManager = configuration.MemoryManager;
+            this.PixelBuffer = this.MemoryManager.Allocate2D<TPixel>(width, height, false);
+            this.Clear(configuration.ParallelOptions, clearColor);
+            this.MetaData = metaData;
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ImageFrame{TPixel}" /> class.
         /// </summary>
@@ -267,6 +301,23 @@ internal ImageFrame<TPixel2> CloneAs<TPixel2>()
             return target;
         }
 
+        /// <summary>
+        /// Clears the bitmap.
+        /// </summary>
+        /// <param name="parallelOptions">The parallel options.</param>
+        /// <param name="value">The value to initialize the bitmap with.</param>
+        public void Clear(ParallelOptions parallelOptions, TPixel value) {
+            Parallel.For(
+                0,
+                this.Height,
+                parallelOptions,
+                (int y) =>
+                {
+                    Span<TPixel> targetRow = this.GetPixelRowSpan(y);
+                    targetRow.Fill(value);
+                });
+        }
+
         /// <summary>
         /// Clones the current instance.
         /// </summary>

From 2943df12d751fcfb67d7b5239da1041079cee871 Mon Sep 17 00:00:00 2001
From: woutware <35376607+woutware@users.noreply.github.com>
Date: Mon, 30 Apr 2018 10:27:21 +0200
Subject: [PATCH 06/12] Processed review comment, made ClearColor not nullable.

---
 src/ImageSharp/ImageFrameCollection.cs | 20 ++------------------
 src/ImageSharp/Image{TPixel}.cs        |  4 ++--
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/src/ImageSharp/ImageFrameCollection.cs b/src/ImageSharp/ImageFrameCollection.cs
index 1c00d9e633..f2e35812b5 100644
--- a/src/ImageSharp/ImageFrameCollection.cs
+++ b/src/ImageSharp/ImageFrameCollection.cs
@@ -23,14 +23,7 @@ internal ImageFrameCollection(Image<TPixel> parent, int width, int height)
             this.parent = parent;
 
             // Frames are already cloned within the caller
-            if (parent.ClearColor.HasValue)
-            {
-                this.frames.Add(new ImageFrame<TPixel>(parent.GetConfiguration(), width, height, parent.ClearColor.Value));
-            }
-            else
-            {
-                this.frames.Add(new ImageFrame<TPixel>(parent.GetConfiguration().MemoryManager, width, height));
-            }
+            this.frames.Add(new ImageFrame<TPixel>(parent.GetConfiguration(), width, height, parent.ClearColor));
         }
 
         internal ImageFrameCollection(Image<TPixel> parent, IEnumerable<ImageFrame<TPixel>> frames)
@@ -150,16 +143,7 @@ public Image<TPixel> CloneFrame(int index)
         /// <inheritdoc/>
         public ImageFrame<TPixel> CreateFrame()
         {
-            ImageFrame<TPixel> frame;
-            if (this.parent.ClearColor.HasValue)
-            {
-                frame = new ImageFrame<TPixel>(this.parent.GetConfiguration(), this.RootFrame.Width, this.RootFrame.Height, this.parent.ClearColor.Value);
-            }
-            else
-            {
-                frame = new ImageFrame<TPixel>(this.parent.GetConfiguration().MemoryManager, this.RootFrame.Width, this.RootFrame.Height);
-            }
-
+            ImageFrame<TPixel> frame = new ImageFrame<TPixel>(this.parent.GetConfiguration(), this.RootFrame.Width, this.RootFrame.Height, this.parent.ClearColor);
             this.frames.Add(frame);
             return frame;
         }
diff --git a/src/ImageSharp/Image{TPixel}.cs b/src/ImageSharp/Image{TPixel}.cs
index 2aa5038440..599116414a 100644
--- a/src/ImageSharp/Image{TPixel}.cs
+++ b/src/ImageSharp/Image{TPixel}.cs
@@ -22,7 +22,7 @@ public sealed class Image<TPixel> : IImage, IConfigurable
     {
         private readonly Configuration configuration;
         private readonly ImageFrameCollection<TPixel> frames;
-        private readonly TPixel? clearColor;
+        private readonly TPixel clearColor;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="Image{TPixel}"/> class
@@ -142,7 +142,7 @@ internal Image(Configuration configuration, ImageMetaData metadata, IEnumerable<
         /// <summary>
         /// Gets the clear color to initialize the image frame pixels with.
         /// </summary>
-        internal TPixel? ClearColor => this.clearColor;
+        internal TPixel ClearColor => this.clearColor;
 
         /// <summary>
         /// Gets the root frame.

From aa4a05719fbd011cd4a28f73eb248012b0db20e0 Mon Sep 17 00:00:00 2001
From: woutware <35376607+woutware@users.noreply.github.com>
Date: Mon, 30 Apr 2018 18:22:19 +0200
Subject: [PATCH 07/12] Processed review comments, moved Image.ClearColor to
 ImageFrame.BackgroundColor.

---
 src/ImageSharp/ImageFrameCollection.cs        |  6 ++--
 src/ImageSharp/ImageFrame{TPixel}.cs          | 30 ++++++++++---------
 src/ImageSharp/Image{TPixel}.cs               | 21 +++++--------
 src/ImageSharp/Memory/BufferExtensions.cs     | 12 --------
 .../Image/ImageFramesCollectionTests.cs       |  2 +-
 5 files changed, 27 insertions(+), 44 deletions(-)

diff --git a/src/ImageSharp/ImageFrameCollection.cs b/src/ImageSharp/ImageFrameCollection.cs
index f2e35812b5..1d4735fd8e 100644
--- a/src/ImageSharp/ImageFrameCollection.cs
+++ b/src/ImageSharp/ImageFrameCollection.cs
@@ -16,14 +16,14 @@ internal sealed class ImageFrameCollection<TPixel> : IImageFrameCollection<TPixe
         private readonly IList<ImageFrame<TPixel>> frames = new List<ImageFrame<TPixel>>();
         private readonly Image<TPixel> parent;
 
-        internal ImageFrameCollection(Image<TPixel> parent, int width, int height)
+        internal ImageFrameCollection(Image<TPixel> parent, int width, int height, TPixel backgroundColor)
         {
             Guard.NotNull(parent, nameof(parent));
 
             this.parent = parent;
 
             // Frames are already cloned within the caller
-            this.frames.Add(new ImageFrame<TPixel>(parent.GetConfiguration(), width, height, parent.ClearColor));
+            this.frames.Add(new ImageFrame<TPixel>(parent.GetConfiguration(), width, height, backgroundColor));
         }
 
         internal ImageFrameCollection(Image<TPixel> parent, IEnumerable<ImageFrame<TPixel>> frames)
@@ -143,7 +143,7 @@ public Image<TPixel> CloneFrame(int index)
         /// <inheritdoc/>
         public ImageFrame<TPixel> CreateFrame()
         {
-            ImageFrame<TPixel> frame = new ImageFrame<TPixel>(this.parent.GetConfiguration(), this.RootFrame.Width, this.RootFrame.Height, this.parent.ClearColor);
+            var frame = new ImageFrame<TPixel>(this.parent.GetConfiguration(), this.RootFrame.Width, this.RootFrame.Height, this.RootFrame.BackgroundColor);
             this.frames.Add(frame);
             return frame;
         }
diff --git a/src/ImageSharp/ImageFrame{TPixel}.cs b/src/ImageSharp/ImageFrame{TPixel}.cs
index cb15fe3db2..1c26bb5582 100644
--- a/src/ImageSharp/ImageFrame{TPixel}.cs
+++ b/src/ImageSharp/ImageFrame{TPixel}.cs
@@ -19,8 +19,7 @@ namespace SixLabors.ImageSharp
     /// </summary>
     /// <typeparam name="TPixel">The pixel format.</typeparam>
     public sealed class ImageFrame<TPixel> : IPixelSource<TPixel>, IDisposable
-        where TPixel : struct, IPixel<TPixel>
-    {
+        where TPixel : struct, IPixel<TPixel> {
         private bool isDisposed;
 
         /// <summary>
@@ -30,8 +29,7 @@ public sealed class ImageFrame<TPixel> : IPixelSource<TPixel>, IDisposable
         /// <param name="width">The width of the image in pixels.</param>
         /// <param name="height">The height of the image in pixels.</param>
         internal ImageFrame(MemoryManager memoryManager, int width, int height)
-            : this(memoryManager, width, height, new ImageFrameMetaData())
-        {
+            : this(memoryManager, width, height, new ImageFrameMetaData()) {
         }
 
         /// <summary>
@@ -59,10 +57,9 @@ internal ImageFrame(MemoryManager memoryManager, int width, int height, ImageFra
         /// <param name="configuration">The <see cref="Configuration"/> to use for buffer allocation and parallel options to clear the buffer with.</param>
         /// <param name="width">The width of the image in pixels.</param>
         /// <param name="height">The height of the image in pixels.</param>
-        /// <param name="clearColor">The color to clear the image with.</param>
-        internal ImageFrame(Configuration configuration, int width, int height, TPixel clearColor)
-            : this(configuration, width, height, clearColor, new ImageFrameMetaData())
-        {
+        /// <param name="backgroundColor">The color to clear the image with.</param>
+        internal ImageFrame(Configuration configuration, int width, int height, TPixel backgroundColor)
+            : this(configuration, width, height, backgroundColor, new ImageFrameMetaData()) {
         }
 
         /// <summary>
@@ -71,9 +68,9 @@ internal ImageFrame(Configuration configuration, int width, int height, TPixel c
         /// <param name="configuration">The <see cref="Configuration"/> to use for buffer allocation and parallel options to clear the buffer with.</param>
         /// <param name="width">The width of the image in pixels.</param>
         /// <param name="height">The height of the image in pixels.</param>
-        /// <param name="clearColor">The color to clear the image with.</param>
+        /// <param name="backgroundColor">The color to clear the image with.</param>
         /// <param name="metaData">The meta data.</param>
-        internal ImageFrame(Configuration configuration, int width, int height, TPixel clearColor, ImageFrameMetaData metaData)
+        internal ImageFrame(Configuration configuration, int width, int height, TPixel backgroundColor, ImageFrameMetaData metaData)
         {
             Guard.NotNull(configuration, nameof(configuration));
             Guard.MustBeGreaterThan(width, 0, nameof(width));
@@ -82,7 +79,8 @@ internal ImageFrame(Configuration configuration, int width, int height, TPixel c
 
             this.MemoryManager = configuration.MemoryManager;
             this.PixelBuffer = this.MemoryManager.Allocate2D<TPixel>(width, height, false);
-            this.Clear(configuration.ParallelOptions, clearColor);
+            this.BackgroundColor = backgroundColor;
+            this.Clear(configuration.ParallelOptions, backgroundColor);
             this.MetaData = metaData;
         }
 
@@ -93,8 +91,7 @@ internal ImageFrame(Configuration configuration, int width, int height, TPixel c
         /// <param name="size">The <see cref="Size"/> of the frame.</param>
         /// <param name="metaData">The meta data.</param>
         internal ImageFrame(MemoryManager memoryManager, Size size, ImageFrameMetaData metaData)
-            : this(memoryManager, size.Width, size.Height, metaData)
-        {
+            : this(memoryManager, size.Width, size.Height, metaData) {
         }
 
         /// <summary>
@@ -133,6 +130,11 @@ internal ImageFrame(MemoryManager memoryManager, ImageFrame<TPixel> source)
         /// </summary>
         public int Height => this.PixelBuffer.Height;
 
+        /// <summary>
+        /// Gets the background color.
+        /// </summary>
+        public TPixel BackgroundColor { get; }
+
         /// <summary>
         /// Gets the meta data of the frame.
         /// </summary>
@@ -306,7 +308,7 @@ internal ImageFrame<TPixel2> CloneAs<TPixel2>()
         /// </summary>
         /// <param name="parallelOptions">The parallel options.</param>
         /// <param name="value">The value to initialize the bitmap with.</param>
-        public void Clear(ParallelOptions parallelOptions, TPixel value) {
+        internal void Clear(ParallelOptions parallelOptions, TPixel value) {
             Parallel.For(
                 0,
                 this.Height,
diff --git a/src/ImageSharp/Image{TPixel}.cs b/src/ImageSharp/Image{TPixel}.cs
index 599116414a..2d98696028 100644
--- a/src/ImageSharp/Image{TPixel}.cs
+++ b/src/ImageSharp/Image{TPixel}.cs
@@ -22,7 +22,6 @@ public sealed class Image<TPixel> : IImage, IConfigurable
     {
         private readonly Configuration configuration;
         private readonly ImageFrameCollection<TPixel> frames;
-        private readonly TPixel clearColor;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="Image{TPixel}"/> class
@@ -47,9 +46,9 @@ public Image(Configuration configuration, int width, int height)
         /// </param>
         /// <param name="width">The width of the image in pixels.</param>
         /// <param name="height">The height of the image in pixels.</param>
-        /// <param name="clearColor">The color to initialize the pixels with.</param>
-        public Image(Configuration configuration, int width, int height, TPixel clearColor)
-            : this(configuration, width, height, clearColor, new ImageMetaData())
+        /// <param name="backgroundColor">The color to initialize the pixels with.</param>
+        public Image(Configuration configuration, int width, int height, TPixel backgroundColor)
+            : this(configuration, width, height, backgroundColor, new ImageMetaData())
         {
         }
 
@@ -79,7 +78,7 @@ internal Image(Configuration configuration, int width, int height, ImageMetaData
             this.configuration = configuration ?? Configuration.Default;
             this.PixelType = new PixelTypeInfo(Unsafe.SizeOf<TPixel>() * 8);
             this.MetaData = metadata ?? new ImageMetaData();
-            this.frames = new ImageFrameCollection<TPixel>(this, width, height);
+            this.frames = new ImageFrameCollection<TPixel>(this, width, height, default(TPixel));
         }
 
         /// <summary>
@@ -91,14 +90,13 @@ internal Image(Configuration configuration, int width, int height, ImageMetaData
         /// </param>
         /// <param name="width">The width of the image in pixels.</param>
         /// <param name="height">The height of the image in pixels.</param>
-        /// <param name="clearColor">The clear color.</param>
+        /// <param name="backgroundColor">The color to initialize the pixels with.</param>
         /// <param name="metadata">The images metadata.</param>
-        internal Image(Configuration configuration, int width, int height, TPixel clearColor, ImageMetaData metadata) {
+        internal Image(Configuration configuration, int width, int height, TPixel backgroundColor, ImageMetaData metadata) {
             this.configuration = configuration ?? Configuration.Default;
             this.PixelType = new PixelTypeInfo(Unsafe.SizeOf<TPixel>() * 8);
             this.MetaData = metadata ?? new ImageMetaData();
-            this.clearColor = clearColor;
-            this.frames = new ImageFrameCollection<TPixel>(this, width, height);
+            this.frames = new ImageFrameCollection<TPixel>(this, width, height, backgroundColor);
         }
 
         /// <summary>
@@ -139,11 +137,6 @@ internal Image(Configuration configuration, ImageMetaData metadata, IEnumerable<
         /// </summary>
         public IImageFrameCollection<TPixel> Frames => this.frames;
 
-        /// <summary>
-        /// Gets the clear color to initialize the image frame pixels with.
-        /// </summary>
-        internal TPixel ClearColor => this.clearColor;
-
         /// <summary>
         /// Gets the root frame.
         /// </summary>
diff --git a/src/ImageSharp/Memory/BufferExtensions.cs b/src/ImageSharp/Memory/BufferExtensions.cs
index 1347f28821..dd3114c21c 100644
--- a/src/ImageSharp/Memory/BufferExtensions.cs
+++ b/src/ImageSharp/Memory/BufferExtensions.cs
@@ -52,18 +52,6 @@ public static void Clear<T>(this IBuffer<T> buffer)
             buffer.Span.Clear();
         }
 
-        /// <summary>
-        /// Fills the contents of this buffer.
-        /// </summary>
-        /// <param name="buffer">The buffer</param>
-        /// <param name="value">The value to fill the buffer with.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void Fill<T>(this IBuffer<T> buffer, T value)
-            where T : struct
-        {
-            buffer.Span.Fill(value);
-        }
-
         public static ref T DangerousGetPinnableReference<T>(this IBuffer<T> buffer)
             where T : struct =>
             ref MemoryMarshal.GetReference(buffer.Span);
diff --git a/tests/ImageSharp.Tests/Image/ImageFramesCollectionTests.cs b/tests/ImageSharp.Tests/Image/ImageFramesCollectionTests.cs
index 4c760e6810..cb185d9773 100644
--- a/tests/ImageSharp.Tests/Image/ImageFramesCollectionTests.cs
+++ b/tests/ImageSharp.Tests/Image/ImageFramesCollectionTests.cs
@@ -19,7 +19,7 @@ public ImageFramesCollectionTests()
             System.Threading.Thread.CurrentThread.CurrentUICulture = new System.Globalization.CultureInfo("en-US");
 
             this.image = new Image<Rgba32>(10, 10);
-            this.collection = new ImageFrameCollection<Rgba32>(this.image, 10, 10);
+            this.collection = new ImageFrameCollection<Rgba32>(this.image, 10, 10, default);
         }
 
         [Fact]

From 7c70a5efcfd4b6be1c0a4a1f4d588a8a869128a4 Mon Sep 17 00:00:00 2001
From: woutware <35376607+woutware@users.noreply.github.com>
Date: Tue, 1 May 2018 10:36:20 +0200
Subject: [PATCH 08/12] Processed review comments, removed
 ImageFrame.BackgroundColor property.

---
 src/ImageSharp/ImageFrameCollection.cs | 2 +-
 src/ImageSharp/ImageFrame{TPixel}.cs   | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/ImageSharp/ImageFrameCollection.cs b/src/ImageSharp/ImageFrameCollection.cs
index 1d4735fd8e..eb118979c8 100644
--- a/src/ImageSharp/ImageFrameCollection.cs
+++ b/src/ImageSharp/ImageFrameCollection.cs
@@ -143,7 +143,7 @@ public Image<TPixel> CloneFrame(int index)
         /// <inheritdoc/>
         public ImageFrame<TPixel> CreateFrame()
         {
-            var frame = new ImageFrame<TPixel>(this.parent.GetConfiguration(), this.RootFrame.Width, this.RootFrame.Height, this.RootFrame.BackgroundColor);
+            var frame = new ImageFrame<TPixel>(this.parent.GetConfiguration(), this.RootFrame.Width, this.RootFrame.Height, default);
             this.frames.Add(frame);
             return frame;
         }
diff --git a/src/ImageSharp/ImageFrame{TPixel}.cs b/src/ImageSharp/ImageFrame{TPixel}.cs
index 1c26bb5582..c3955c1321 100644
--- a/src/ImageSharp/ImageFrame{TPixel}.cs
+++ b/src/ImageSharp/ImageFrame{TPixel}.cs
@@ -79,7 +79,6 @@ internal ImageFrame(Configuration configuration, int width, int height, TPixel b
 
             this.MemoryManager = configuration.MemoryManager;
             this.PixelBuffer = this.MemoryManager.Allocate2D<TPixel>(width, height, false);
-            this.BackgroundColor = backgroundColor;
             this.Clear(configuration.ParallelOptions, backgroundColor);
             this.MetaData = metaData;
         }
@@ -130,11 +129,6 @@ internal ImageFrame(MemoryManager memoryManager, ImageFrame<TPixel> source)
         /// </summary>
         public int Height => this.PixelBuffer.Height;
 
-        /// <summary>
-        /// Gets the background color.
-        /// </summary>
-        public TPixel BackgroundColor { get; }
-
         /// <summary>
         /// Gets the meta data of the frame.
         /// </summary>

From 0d81089159548ff584bf0519fa7c7ba880f5030c Mon Sep 17 00:00:00 2001
From: woutware <35376607+woutware@users.noreply.github.com>
Date: Tue, 1 May 2018 15:14:34 +0200
Subject: [PATCH 09/12] Processed review comments, removed
 IImageFrameCollection interface, and added backgroundColor parameter to
 ImageFrameCollection.CreateFrame() method with default.

---
 src/ImageSharp/IImageFrameCollection.cs | 115 ----------------------
 src/ImageSharp/ImageFrameCollection.cs  | 123 ++++++++++++++++++------
 src/ImageSharp/Image{TPixel}.cs         |   2 +-
 3 files changed, 94 insertions(+), 146 deletions(-)
 delete mode 100644 src/ImageSharp/IImageFrameCollection.cs

diff --git a/src/ImageSharp/IImageFrameCollection.cs b/src/ImageSharp/IImageFrameCollection.cs
deleted file mode 100644
index 59c64a6af6..0000000000
--- a/src/ImageSharp/IImageFrameCollection.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-// Copyright (c) Six Labors and contributors.
-// Licensed under the Apache License, Version 2.0.
-
-using System;
-using System.Collections.Generic;
-
-using SixLabors.ImageSharp.PixelFormats;
-
-namespace SixLabors.ImageSharp
-{
-    /// <summary>
-    /// Encapsulates a collection of <see cref="ImageFrame{T}"/> instances that make up an <see cref="Image{T}"/>.
-    /// </summary>
-    /// <typeparam name="TPixel">The type of the pixel.</typeparam>
-    public interface IImageFrameCollection<TPixel> : IEnumerable<ImageFrame<TPixel>>
-        where TPixel : struct, IPixel<TPixel>
-    {
-        /// <summary>
-        /// Gets the number of frames.
-        /// </summary>
-        int Count { get; }
-
-        /// <summary>
-        /// Gets the root frame.
-        /// </summary>
-        ImageFrame<TPixel> RootFrame { get; }
-
-        /// <summary>
-        /// Gets the <see cref="ImageFrame{TPixel}"/> at the specified index.
-        /// </summary>
-        /// <value>
-        /// The <see cref="ImageFrame{TPixel}"/>.
-        /// </value>
-        /// <param name="index">The index.</param>
-        /// <returns>The <see cref="ImageFrame{TPixel}"/> at the specified index.</returns>
-        ImageFrame<TPixel> this[int index] { get; }
-
-        /// <summary>
-        /// Creates an <see cref="Image{T}"/> with only the frame at the specified index
-        /// with the same metadata as the original image.
-        /// </summary>
-        /// <param name="index">The zero-based index of the frame to clone.</param>
-        /// <returns>The new <see cref="Image{TPixel}"/> with the specified frame.</returns>
-        Image<TPixel> CloneFrame(int index);
-
-        /// <summary>
-        /// Removes the frame at the specified index and creates a new image with only the removed frame
-        /// with the same metadata as the original image.
-        /// </summary>
-        /// <param name="index">The zero-based index of the frame to export.</param>
-        /// <exception cref="InvalidOperationException">Cannot remove last frame.</exception>
-        /// <returns>The new <see cref="Image{TPixel}"/> with the specified frame.</returns>
-        Image<TPixel> ExportFrame(int index);
-
-        /// <summary>
-        /// Removes the frame at the specified index and frees all freeable resources associated with it.
-        /// </summary>
-        /// <param name="index">The zero-based index of the frame to remove.</param>
-        /// <exception cref="InvalidOperationException">Cannot remove last frame.</exception>
-        void RemoveFrame(int index);
-
-        /// <summary>
-        /// Creates a new <seealso cref="ImageFrame{TPixel}"/> and appends it to the end of the collection.
-        /// </summary>
-        /// <returns>The new <see cref="ImageFrame{TPixel}"/>.</returns>
-        ImageFrame<TPixel> CreateFrame();
-
-        /// <summary>
-        /// Clones the <paramref name="source"/> frame and appends the clone to the end of the collection.
-        /// </summary>
-        /// <param name="source">The raw pixel data to generate the <seealso cref="ImageFrame{TPixel}"/> from.</param>
-        /// <returns>The cloned <see cref="ImageFrame{TPixel}"/>.</returns>
-        ImageFrame<TPixel> AddFrame(ImageFrame<TPixel> source);
-
-        /// <summary>
-        /// Creates a new frame from the pixel data with the same dimensions as the other frames and inserts the
-        /// new frame at the end of the collection.
-        /// </summary>
-        /// <param name="source">The raw pixel data to generate the <seealso cref="ImageFrame{TPixel}"/> from.</param>
-        /// <returns>The new <see cref="ImageFrame{TPixel}"/>.</returns>
-        ImageFrame<TPixel> AddFrame(TPixel[] source);
-
-        /// <summary>
-        /// Clones and inserts the <paramref name="source"/> into the <seealso cref="IImageFrameCollection{TPixel}"/> at the specified <paramref name="index"/>.
-        /// </summary>
-        /// <param name="index">The zero-based index to insert the frame at.</param>
-        /// <param name="source">The <seealso cref="ImageFrame{TPixel}"/> to clone and insert into the <seealso cref="IImageFrameCollection{TPixel}"/>.</param>
-        /// <exception cref="ArgumentException">Frame must have the same dimensions as the image.</exception>
-        /// <returns>The cloned <see cref="ImageFrame{TPixel}"/>.</returns>
-        ImageFrame<TPixel> InsertFrame(int index, ImageFrame<TPixel> source);
-
-        /// <summary>
-        /// Moves an <seealso cref="ImageFrame{TPixel}"/> from <paramref name="sourceIndex"/> to <paramref name="destinationIndex"/>.
-        /// </summary>
-        /// <param name="sourceIndex">The zero-based index of the frame to move.</param>
-        /// <param name="destinationIndex">The index to move the frame to.</param>
-        void MoveFrame(int sourceIndex, int destinationIndex);
-
-        /// <summary>
-        /// Determines the index of a specific <paramref name="frame"/> in the <seealso cref="IImageFrameCollection{TPixel}"/>.
-        /// </summary>
-        /// <param name="frame">The <seealso cref="ImageFrame{TPixel}"/> to locate in the <seealso cref="IImageFrameCollection{TPixel}"/>.</param>
-        /// <returns>The index of item if found in the list; otherwise, -1.</returns>
-        int IndexOf(ImageFrame<TPixel> frame);
-
-        /// <summary>
-        /// Determines whether the <seealso cref="IImageFrameCollection{TPixel}"/> contains the <paramref name="frame"/>.
-        /// </summary>
-        /// <param name="frame">The frame.</param>
-        /// <returns>
-        ///   <c>true</c> if the <seealso cref="IImageFrameCollection{TPixel}"/> contains the specified frame; otherwise, <c>false</c>.
-        /// </returns>
-        bool Contains(ImageFrame<TPixel> frame);
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp/ImageFrameCollection.cs b/src/ImageSharp/ImageFrameCollection.cs
index eb118979c8..97a8df875d 100644
--- a/src/ImageSharp/ImageFrameCollection.cs
+++ b/src/ImageSharp/ImageFrameCollection.cs
@@ -9,8 +9,11 @@
 
 namespace SixLabors.ImageSharp
 {
-    /// <inheritdoc/>
-    internal sealed class ImageFrameCollection<TPixel> : IImageFrameCollection<TPixel>
+    /// <summary>
+    /// Encapsulates a collection of <see cref="ImageFrame{T}"/> instances that make up an <see cref="Image{T}"/>.
+    /// </summary>
+    /// <typeparam name="TPixel">The type of the pixel.</typeparam>
+    public sealed class ImageFrameCollection<TPixel> : IEnumerable<ImageFrame<TPixel>>
         where TPixel : struct, IPixel<TPixel>
     {
         private readonly IList<ImageFrame<TPixel>> frames = new List<ImageFrame<TPixel>>();
@@ -41,51 +44,85 @@ internal ImageFrameCollection(Image<TPixel> parent, IEnumerable<ImageFrame<TPixe
             }
         }
 
-        /// <inheritdoc/>
+        /// <summary>
+        /// Gets the number of frames.
+        /// </summary>
         public int Count => this.frames.Count;
 
-        /// <inheritdoc/>
+        /// <summary>
+        /// Gets the root frame.
+        /// </summary>
         public ImageFrame<TPixel> RootFrame => this.frames.Count > 0 ? this.frames[0] : null;
 
-        /// <inheritdoc/>
+        /// <summary>
+        /// Gets the <see cref="ImageFrame{TPixel}"/> at the specified index.
+        /// </summary>
+        /// <value>
+        /// The <see cref="ImageFrame{TPixel}"/>.
+        /// </value>
+        /// <param name="index">The index.</param>
+        /// <returns>The <see cref="ImageFrame{TPixel}"/> at the specified index.</returns>
         public ImageFrame<TPixel> this[int index] => this.frames[index];
 
-        /// <inheritdoc/>
+        /// <summary>
+        /// Determines the index of a specific <paramref name="frame"/> in the <seealso cref="ImageFrameCollection{TPixel}"/>.
+        /// </summary>
+        /// <param name="frame">The <seealso cref="ImageFrame{TPixel}"/> to locate in the <seealso cref="ImageFrameCollection{TPixel}"/>.</param>
+        /// <returns>The index of item if found in the list; otherwise, -1.</returns>
         public int IndexOf(ImageFrame<TPixel> frame) => this.frames.IndexOf(frame);
 
-        /// <inheritdoc/>
-        public ImageFrame<TPixel> InsertFrame(int index, ImageFrame<TPixel> frame)
+        /// <summary>
+        /// Clones and inserts the <paramref name="source"/> into the <seealso cref="ImageFrameCollection{TPixel}"/> at the specified <paramref name="index"/>.
+        /// </summary>
+        /// <param name="index">The zero-based index to insert the frame at.</param>
+        /// <param name="source">The <seealso cref="ImageFrame{TPixel}"/> to clone and insert into the <seealso cref="ImageFrameCollection{TPixel}"/>.</param>
+        /// <exception cref="ArgumentException">Frame must have the same dimensions as the image.</exception>
+        /// <returns>The cloned <see cref="ImageFrame{TPixel}"/>.</returns>
+        public ImageFrame<TPixel> InsertFrame(int index, ImageFrame<TPixel> source)
         {
-            this.ValidateFrame(frame);
-            ImageFrame<TPixel> clonedFrame = frame.Clone();
+            this.ValidateFrame(source);
+            ImageFrame<TPixel> clonedFrame = source.Clone();
             this.frames.Insert(index, clonedFrame);
             return clonedFrame;
         }
 
-        /// <inheritdoc/>
-        public ImageFrame<TPixel> AddFrame(ImageFrame<TPixel> frame)
+        /// <summary>
+        /// Clones the <paramref name="source"/> frame and appends the clone to the end of the collection.
+        /// </summary>
+        /// <param name="source">The raw pixel data to generate the <seealso cref="ImageFrame{TPixel}"/> from.</param>
+        /// <returns>The cloned <see cref="ImageFrame{TPixel}"/>.</returns>
+        public ImageFrame<TPixel> AddFrame(ImageFrame<TPixel> source)
         {
-            this.ValidateFrame(frame);
-            ImageFrame<TPixel> clonedFrame = frame.Clone();
+            this.ValidateFrame(source);
+            ImageFrame<TPixel> clonedFrame = source.Clone();
             this.frames.Add(clonedFrame);
             return clonedFrame;
         }
 
-        /// <inheritdoc/>
-        public ImageFrame<TPixel> AddFrame(TPixel[] data)
+        /// <summary>
+        /// Creates a new frame from the pixel data with the same dimensions as the other frames and inserts the
+        /// new frame at the end of the collection.
+        /// </summary>
+        /// <param name="source">The raw pixel data to generate the <seealso cref="ImageFrame{TPixel}"/> from.</param>
+        /// <returns>The new <see cref="ImageFrame{TPixel}"/>.</returns>
+        public ImageFrame<TPixel> AddFrame(TPixel[] source)
         {
-            Guard.NotNull(data, nameof(data));
+            Guard.NotNull(source, nameof(source));
 
             var frame = ImageFrame.LoadPixelData(
                 this.parent.GetMemoryManager(),
-                new Span<TPixel>(data),
+                new Span<TPixel>(source),
                 this.RootFrame.Width,
                 this.RootFrame.Height);
             this.frames.Add(frame);
             return frame;
         }
 
-        /// <inheritdoc/>
+        /// <summary>
+        /// Removes the frame at the specified index and frees all freeable resources associated with it.
+        /// </summary>
+        /// <param name="index">The zero-based index of the frame to remove.</param>
+        /// <exception cref="InvalidOperationException">Cannot remove last frame.</exception>
         public void RemoveFrame(int index)
         {
             if (index == 0 && this.Count == 1)
@@ -98,26 +135,42 @@ public void RemoveFrame(int index)
             frame.Dispose();
         }
 
-        /// <inheritdoc/>
+        /// <summary>
+        /// Determines whether the <seealso cref="ImageFrameCollection{TPixel}"/> contains the <paramref name="frame"/>.
+        /// </summary>
+        /// <param name="frame">The frame.</param>
+        /// <returns>
+        ///   <c>true</c> if the <seealso cref="ImageFrameCollection{TPixel}"/> contains the specified frame; otherwise, <c>false</c>.
+        /// </returns>
         public bool Contains(ImageFrame<TPixel> frame)
         {
             return this.frames.Contains(frame);
         }
 
-        /// <inheritdoc/>
-        public void MoveFrame(int sourceIndex, int destIndex)
+        /// <summary>
+        /// Moves an <seealso cref="ImageFrame{TPixel}"/> from <paramref name="sourceIndex"/> to <paramref name="destinationIndex"/>.
+        /// </summary>
+        /// <param name="sourceIndex">The zero-based index of the frame to move.</param>
+        /// <param name="destinationIndex">The index to move the frame to.</param>
+        public void MoveFrame(int sourceIndex, int destinationIndex)
         {
-            if (sourceIndex == destIndex)
+            if (sourceIndex == destinationIndex)
             {
                 return;
             }
 
             ImageFrame<TPixel> frameAtIndex = this.frames[sourceIndex];
             this.frames.RemoveAt(sourceIndex);
-            this.frames.Insert(destIndex, frameAtIndex);
+            this.frames.Insert(destinationIndex, frameAtIndex);
         }
 
-        /// <inheritdoc/>
+        /// <summary>
+        /// Removes the frame at the specified index and creates a new image with only the removed frame
+        /// with the same metadata as the original image.
+        /// </summary>
+        /// <param name="index">The zero-based index of the frame to export.</param>
+        /// <exception cref="InvalidOperationException">Cannot remove last frame.</exception>
+        /// <returns>The new <see cref="Image{TPixel}"/> with the specified frame.</returns>
         public Image<TPixel> ExportFrame(int index)
         {
             ImageFrame<TPixel> frame = this[index];
@@ -132,7 +185,12 @@ public Image<TPixel> ExportFrame(int index)
             return new Image<TPixel>(this.parent.GetConfiguration(), this.parent.MetaData.Clone(), new[] { frame });
         }
 
-        /// <inheritdoc/>
+        /// <summary>
+        /// Creates an <see cref="Image{T}"/> with only the frame at the specified index
+        /// with the same metadata as the original image.
+        /// </summary>
+        /// <param name="index">The zero-based index of the frame to clone.</param>
+        /// <returns>The new <see cref="Image{TPixel}"/> with the specified frame.</returns>
         public Image<TPixel> CloneFrame(int index)
         {
             ImageFrame<TPixel> frame = this[index];
@@ -140,10 +198,15 @@ public Image<TPixel> CloneFrame(int index)
             return new Image<TPixel>(this.parent.GetConfiguration(), this.parent.MetaData.Clone(), new[] { clonedFrame });
         }
 
-        /// <inheritdoc/>
-        public ImageFrame<TPixel> CreateFrame()
-        {
-            var frame = new ImageFrame<TPixel>(this.parent.GetConfiguration(), this.RootFrame.Width, this.RootFrame.Height, default);
+        /// <summary>
+        /// Creates a new <seealso cref="ImageFrame{TPixel}" /> and appends it to the end of the collection.
+        /// </summary>
+        /// <param name="backgroundColor">The background color to initialize the pixels with.</param>
+        /// <returns>
+        /// The new <see cref="ImageFrame{TPixel}" />.
+        /// </returns>
+        public ImageFrame<TPixel> CreateFrame(TPixel backgroundColor = default) {
+            var frame = new ImageFrame<TPixel>(this.parent.GetConfiguration(), this.RootFrame.Width, this.RootFrame.Height, backgroundColor);
             this.frames.Add(frame);
             return frame;
         }
diff --git a/src/ImageSharp/Image{TPixel}.cs b/src/ImageSharp/Image{TPixel}.cs
index 2d98696028..596dc9bcd0 100644
--- a/src/ImageSharp/Image{TPixel}.cs
+++ b/src/ImageSharp/Image{TPixel}.cs
@@ -135,7 +135,7 @@ internal Image(Configuration configuration, ImageMetaData metadata, IEnumerable<
         /// <summary>
         /// Gets the frames.
         /// </summary>
-        public IImageFrameCollection<TPixel> Frames => this.frames;
+        public ImageFrameCollection<TPixel> Frames => this.frames;
 
         /// <summary>
         /// Gets the root frame.

From 24f6ff98f8e7014169c71dc0f650a9a07393254a Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Tue, 1 May 2018 18:00:43 +0200
Subject: [PATCH 10/12] minor code cleanup in FillProcessor.cs

---
 .../Drawing/Processors/FillProcessor.cs       | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/ImageSharp.Drawing/Processing/Drawing/Processors/FillProcessor.cs b/src/ImageSharp.Drawing/Processing/Drawing/Processors/FillProcessor.cs
index 44329e3597..645ff03537 100644
--- a/src/ImageSharp.Drawing/Processing/Drawing/Processors/FillProcessor.cs
+++ b/src/ImageSharp.Drawing/Processing/Drawing/Processors/FillProcessor.cs
@@ -52,14 +52,8 @@ protected override void OnFrameApply(ImageFrame<TPixel> source, Rectangle source
 
             int width = maxX - minX;
 
-            var solidBrush = this.brush as SolidBrush<TPixel>;
-
             // If there's no reason for blending, then avoid it.
-            if (solidBrush != null &&
-                (
-                    (this.options.BlenderMode == PixelBlenderMode.Normal && this.options.BlendPercentage == 1f && solidBrush.Color.ToVector4().W == 1f) ||
-                    (this.options.BlenderMode == PixelBlenderMode.Over && this.options.BlendPercentage == 1f && solidBrush.Color.ToVector4().W == 1f) ||
-                    (this.options.BlenderMode == PixelBlenderMode.Src)))
+            if (this.IsSolidBrushWithoutBlending(out SolidBrush<TPixel> solidBrush))
             {
                 Parallel.For(
                     minY,
@@ -67,8 +61,6 @@ protected override void OnFrameApply(ImageFrame<TPixel> source, Rectangle source
                     configuration.ParallelOptions,
                     y =>
                     {
-                        int offsetY = y - startY;
-                        int offsetX = minX - startX;
                         source.GetPixelRowSpan(y).Slice(minX, width).Fill(solidBrush.Color);
                     });
             }
@@ -107,5 +99,17 @@ protected override void OnFrameApply(ImageFrame<TPixel> source, Rectangle source
                 }
             }
         }
+
+        private bool IsSolidBrushWithoutBlending(out SolidBrush<TPixel> solidBrush)
+        {
+            solidBrush = this.brush as SolidBrush<TPixel>;
+
+            return solidBrush != null
+                   && ((this.options.BlenderMode == PixelBlenderMode.Normal && this.options.BlendPercentage == 1f
+                                                                            && solidBrush.Color.ToVector4().W == 1f)
+                       || (this.options.BlenderMode == PixelBlenderMode.Over && this.options.BlendPercentage == 1f
+                                                                             && solidBrush.Color.ToVector4().W == 1f)
+                       || (this.options.BlenderMode == PixelBlenderMode.Src));
+        }
     }
 }
\ No newline at end of file

From a9816fd937341598ad4bdd7e793ab289caf30253 Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Tue, 1 May 2018 18:33:44 +0200
Subject: [PATCH 11/12] use overloading in ImageFrameCollection + more tests
 for API-s affected by the PR

---
 src/ImageSharp/ImageFrameCollection.cs        | 20 ++++++-
 .../Image/ImageFramesCollectionTests.cs       | 13 +++-
 tests/ImageSharp.Tests/Image/ImageTests.cs    | 60 +++++++++++++++++--
 .../TestUtilities/TestImageExtensions.cs      | 15 ++++-
 4 files changed, 98 insertions(+), 10 deletions(-)

diff --git a/src/ImageSharp/ImageFrameCollection.cs b/src/ImageSharp/ImageFrameCollection.cs
index 97a8df875d..0318a7068d 100644
--- a/src/ImageSharp/ImageFrameCollection.cs
+++ b/src/ImageSharp/ImageFrameCollection.cs
@@ -198,6 +198,17 @@ public Image<TPixel> CloneFrame(int index)
             return new Image<TPixel>(this.parent.GetConfiguration(), this.parent.MetaData.Clone(), new[] { clonedFrame });
         }
 
+        /// <summary>
+        /// Creates a new <seealso cref="ImageFrame{TPixel}" /> and appends it to the end of the collection.
+        /// </summary>
+        /// <returns>
+        /// The new <see cref="ImageFrame{TPixel}" />.
+        /// </returns>
+        public ImageFrame<TPixel> CreateFrame()
+        {
+            return this.CreateFrame(default);
+        }
+
         /// <summary>
         /// Creates a new <seealso cref="ImageFrame{TPixel}" /> and appends it to the end of the collection.
         /// </summary>
@@ -205,8 +216,13 @@ public Image<TPixel> CloneFrame(int index)
         /// <returns>
         /// The new <see cref="ImageFrame{TPixel}" />.
         /// </returns>
-        public ImageFrame<TPixel> CreateFrame(TPixel backgroundColor = default) {
-            var frame = new ImageFrame<TPixel>(this.parent.GetConfiguration(), this.RootFrame.Width, this.RootFrame.Height, backgroundColor);
+        public ImageFrame<TPixel> CreateFrame(TPixel backgroundColor)
+        {
+            var frame = new ImageFrame<TPixel>(
+                this.parent.GetConfiguration(),
+                this.RootFrame.Width,
+                this.RootFrame.Height,
+                backgroundColor);
             this.frames.Add(frame);
             return frame;
         }
diff --git a/tests/ImageSharp.Tests/Image/ImageFramesCollectionTests.cs b/tests/ImageSharp.Tests/Image/ImageFramesCollectionTests.cs
index cb185d9773..c2ebf83ba7 100644
--- a/tests/ImageSharp.Tests/Image/ImageFramesCollectionTests.cs
+++ b/tests/ImageSharp.Tests/Image/ImageFramesCollectionTests.cs
@@ -225,10 +225,21 @@ public void ExtractFrame<TPixel>(TestImageProvider<TPixel> provider)
         }
 
         [Fact]
-        public void CreateFrame()
+        public void CreateFrame_Default()
         {
             this.image.Frames.CreateFrame();
+
+            Assert.Equal(2, this.image.Frames.Count);
+            this.image.Frames[1].ComparePixelBufferTo(default(Rgba32));
+        }
+
+        [Fact]
+        public void CreateFrame_CustomFillColor()
+        {
+            this.image.Frames.CreateFrame(Rgba32.HotPink);
+
             Assert.Equal(2, this.image.Frames.Count);
+            this.image.Frames[1].ComparePixelBufferTo(Rgba32.HotPink);
         }
 
         [Fact]
diff --git a/tests/ImageSharp.Tests/Image/ImageTests.cs b/tests/ImageSharp.Tests/Image/ImageTests.cs
index da813f4280..8234df24ef 100644
--- a/tests/ImageSharp.Tests/Image/ImageTests.cs
+++ b/tests/ImageSharp.Tests/Image/ImageTests.cs
@@ -13,10 +13,60 @@ namespace SixLabors.ImageSharp.Tests
     /// <summary>
     /// Tests the <see cref="Image"/> class.
     /// </summary>
-    public class ImageTests : FileTestBase
+    public class ImageTests
     {
+        public class Constructor
+        {
+            [Fact]
+            public void Width_Height()
+            {
+                using (var image = new Image<Rgba32>(11, 23))
+                {
+                    Assert.Equal(11, image.Width);
+                    Assert.Equal(23, image.Height);
+                    Assert.Equal(11*23, image.GetPixelSpan().Length);
+                    image.ComparePixelBufferTo(default(Rgba32));
+
+                    Assert.Equal(Configuration.Default, image.GetConfiguration());
+                }
+            }
+
+            [Fact]
+            public void Configuration_Width_Height()
+            {
+                Configuration configuration = Configuration.Default.ShallowCopy();
+
+                using (var image = new Image<Rgba32>(configuration, 11, 23))
+                {
+                    Assert.Equal(11, image.Width);
+                    Assert.Equal(23, image.Height);
+                    Assert.Equal(11 * 23, image.GetPixelSpan().Length);
+                    image.ComparePixelBufferTo(default(Rgba32));
+
+                    Assert.Equal(configuration, image.GetConfiguration());
+                }
+            }
+
+            [Fact]
+            public void Configuration_Width_Height_BackroundColor()
+            {
+                Configuration configuration = Configuration.Default.ShallowCopy();
+                Rgba32 color = Rgba32.Aquamarine;
+
+                using (var image = new Image<Rgba32>(configuration, 11, 23, color))
+                {
+                    Assert.Equal(11, image.Width);
+                    Assert.Equal(23, image.Height);
+                    Assert.Equal(11 * 23, image.GetPixelSpan().Length);
+                    image.ComparePixelBufferTo(color);
+
+                    Assert.Equal(configuration, image.GetConfiguration());
+                }
+            }
+        }
+
         [Fact]
-        public void ConstructorByteArray()
+        public void Load_ByteArray()
         {
             Assert.Throws<ArgumentNullException>(() =>
             {
@@ -32,7 +82,7 @@ public void ConstructorByteArray()
         }
 
         [Fact]
-        public void ConstructorFileSystem()
+        public void Load_FileSystemPath()
         {
             TestFile file = TestFile.Create(TestImages.Bmp.Car);
             using (Image<Rgba32> image = Image.Load<Rgba32>(file.FullPath))
@@ -43,7 +93,7 @@ public void ConstructorFileSystem()
         }
 
         [Fact]
-        public void ConstructorFileSystem_FileNotFound()
+        public void Load_FileSystemPath_FileNotFound()
         {
             System.IO.FileNotFoundException ex = Assert.Throws<System.IO.FileNotFoundException>(
                 () =>
@@ -53,7 +103,7 @@ public void ConstructorFileSystem_FileNotFound()
         }
 
         [Fact]
-        public void ConstructorFileSystem_NullPath()
+        public void Load_FileSystemPath_NullPath()
         {
             ArgumentNullException ex = Assert.Throws<ArgumentNullException>(
                 () =>
diff --git a/tests/ImageSharp.Tests/TestUtilities/TestImageExtensions.cs b/tests/ImageSharp.Tests/TestUtilities/TestImageExtensions.cs
index f37df48dce..8955eeb63c 100644
--- a/tests/ImageSharp.Tests/TestUtilities/TestImageExtensions.cs
+++ b/tests/ImageSharp.Tests/TestUtilities/TestImageExtensions.cs
@@ -361,14 +361,25 @@ public static Image<TPixel> ComparePixelBufferTo<TPixel>(
         public static Image<TPixel> ComparePixelBufferTo<TPixel>(this Image<TPixel> image, TPixel expectedPixel)
             where TPixel : struct, IPixel<TPixel>
         {
-            Span<TPixel> actualPixels = image.GetPixelSpan();
+            foreach (ImageFrame<TPixel> imageFrame in image.Frames)
+            {
+                imageFrame.ComparePixelBufferTo(expectedPixel);
+            }
+            
+            return image;
+        }
+
+        public static ImageFrame<TPixel> ComparePixelBufferTo<TPixel>(this ImageFrame<TPixel> imageFrame, TPixel expectedPixel)
+            where TPixel : struct, IPixel<TPixel>
+        {
+            Span<TPixel> actualPixels = imageFrame.GetPixelSpan();
 
             for (int i = 0; i < actualPixels.Length; i++)
             {
                 Assert.True(expectedPixel.Equals(actualPixels[i]), $"Pixels are different on position {i}!");
             }
 
-            return image;
+            return imageFrame;
         }
 
         public static ImageFrame<TPixel> ComparePixelBufferTo<TPixel>(

From 72cb50c0c7e805d6e0c1d310578b4038c3ab203d Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Wed, 2 May 2018 13:52:40 +1000
Subject: [PATCH 12/12] Delete merge conflict backup file.

---
 .../Drawing/Processors/FillProcessor.cs.orig  | 121 ------------------
 1 file changed, 121 deletions(-)
 delete mode 100644 src/ImageSharp.Drawing/Processing/Drawing/Processors/FillProcessor.cs.orig

diff --git a/src/ImageSharp.Drawing/Processing/Drawing/Processors/FillProcessor.cs.orig b/src/ImageSharp.Drawing/Processing/Drawing/Processors/FillProcessor.cs.orig
deleted file mode 100644
index 7da01b24f8..0000000000
--- a/src/ImageSharp.Drawing/Processing/Drawing/Processors/FillProcessor.cs.orig
+++ /dev/null
@@ -1,121 +0,0 @@
-// Copyright (c) Six Labors and contributors.
-// Licensed under the Apache License, Version 2.0.
-
-using System;
-using System.Threading.Tasks;
-using SixLabors.ImageSharp.Advanced;
-using SixLabors.ImageSharp.Memory;
-using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Drawing.Brushes;
-using SixLabors.ImageSharp.Processing.Processors;
-using SixLabors.Primitives;
-
-namespace SixLabors.ImageSharp.Processing.Drawing.Processors
-{
-    /// <summary>
-    /// Using the brush as a source of pixels colors blends the brush color with source.
-    /// </summary>
-    /// <typeparam name="TPixel">The pixel format.</typeparam>
-    internal class FillProcessor<TPixel> : ImageProcessor<TPixel>
-        where TPixel : struct, IPixel<TPixel>
-    {
-        /// <summary>
-        /// The brush.
-        /// </summary>
-        private readonly IBrush<TPixel> brush;
-        private readonly GraphicsOptions options;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FillProcessor{TPixel}"/> class.
-        /// </summary>
-        /// <param name="brush">The brush to source pixel colors from.</param>
-        /// <param name="options">The options</param>
-        public FillProcessor(IBrush<TPixel> brush, GraphicsOptions options)
-        {
-            this.brush = brush;
-            this.options = options;
-        }
-
-        /// <inheritdoc/>
-        protected override void OnFrameApply(ImageFrame<TPixel> source, Rectangle sourceRectangle, Configuration configuration)
-        {
-            int startX = sourceRectangle.X;
-            int endX = sourceRectangle.Right;
-            int startY = sourceRectangle.Y;
-            int endY = sourceRectangle.Bottom;
-
-            // Align start/end positions.
-            int minX = Math.Max(0, startX);
-            int maxX = Math.Min(source.Width, endX);
-            int minY = Math.Max(0, startY);
-            int maxY = Math.Min(source.Height, endY);
-
-            int width = maxX - minX;
-
-<<<<<<< HEAD
-            var solidBrush = this.brush as SolidBrush<TPixel>;
-=======
-            using (IBuffer<float> amount = source.MemoryManager.Allocate<float>(width))
-            using (BrushApplicator<TPixel> applicator = this.brush.CreateApplicator(
-                source,
-                sourceRectangle,
-                this.options))
-            {
-                amount.Span.Fill(1f);
->>>>>>> master
-
-            // If there's no reason for blending, then avoid it.
-            if (solidBrush != null &&
-                (
-                    (this.options.BlenderMode == PixelBlenderMode.Normal && this.options.BlendPercentage == 1f && solidBrush.Color.ToVector4().W == 1f) ||
-                    (this.options.BlenderMode == PixelBlenderMode.Over && this.options.BlendPercentage == 1f && solidBrush.Color.ToVector4().W == 1f) ||
-                    (this.options.BlenderMode == PixelBlenderMode.Src)))
-            {
-                Parallel.For(
-                    minY,
-                    maxY,
-                    configuration.ParallelOptions,
-                    y =>
-                    {
-                        int offsetY = y - startY;
-                        int offsetX = minX - startX;
-                        source.GetPixelRowSpan(y).Slice(minX, width).Fill(solidBrush.Color);
-                    });
-            }
-            else
-            {
-                // Reset offset if necessary.
-                if (minX > 0)
-                {
-                    startX = 0;
-                }
-
-                if (minY > 0)
-                {
-                    startY = 0;
-                }
-
-                using (IBuffer<float> amount = source.MemoryManager.Allocate<float>(width))
-                using (BrushApplicator<TPixel> applicator = this.brush.CreateApplicator(
-                    source,
-                    sourceRectangle,
-                    this.options))
-                {
-                    amount.Span.Fill(this.options.BlendPercentage);
-
-                    Parallel.For(
-                        minY,
-                        maxY,
-                        configuration.ParallelOptions,
-                        y =>
-                            {
-                                int offsetY = y - startY;
-                                int offsetX = minX - startX;
-
-                                applicator.Apply(amount.Span, offsetX, offsetY);
-                            });
-                }
-            }
-        }
-    }
-}
\ No newline at end of file