Refactor Image, ImageFrame + IImage

src/ImageSharp.Drawing/Processors/DrawImageProcessor.cs

@@ -4,7 +4,6 @@
 using System;
 using System.Threading.Tasks;
 using SixLabors.ImageSharp.Advanced;
-using SixLabors.ImageSharp.Helpers;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing.Processors;

src/ImageSharp/Advanced/AdvancedImageExtensions.cs

@@ -26,7 +26,7 @@ namespace SixLabors.ImageSharp.Advanced
         /// <summary>
         /// Returns a reference to the 0th element of the Pixel buffer,
         /// allowing direct manipulation of pixel data through unsafe operations.
-        /// The pixel buffer is a contigous memory area containing Width*Height TPixel elements layed out in row-major order.
+        /// The pixel buffer is a contiguous memory area containing Width*Height TPixel elements laid out in row-major order.
         /// </summary>
         /// <typeparam name="TPixel">The Pixel format.</typeparam>
         /// <param name="source">The source image frame</param>

src/ImageSharp/Advanced/IPixelSource.cs

@@ -1,10 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-using System;
-using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.Memory;
-using SixLabors.ImageSharp.MetaData;
 using SixLabors.ImageSharp.PixelFormats;
 
 namespace SixLabors.ImageSharp.Advanced

src/ImageSharp/Formats/Jpeg/Common/Decoder/JpegImagePostProcessor.cs

@@ -2,7 +2,6 @@ using System;
 using System.Linq;
 using System.Numerics;
 using SixLabors.ImageSharp.Advanced;
-using SixLabors.ImageSharp.Helpers;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Primitives;
@@ -116,7 +115,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Common.Decoder
         }
 
         /// <summary>
-        /// Execute one step rocessing <see cref="PixelRowsPerStep"/> pixel rows into 'destination'.
+        /// Execute one step processing <see cref="PixelRowsPerStep"/> pixel rows into 'destination'.
         /// </summary>
         /// <typeparam name="TPixel">The pixel type</typeparam>
         /// <param name="destination">The destination image.</param>

src/ImageSharp/Helpers/ImageExtensions.cs

@@ -1,61 +0,0 @@
-// Copyright (c) Six Labors and contributors.
-// Licensed under the Apache License, Version 2.0.
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Runtime.CompilerServices;
-using System.Text;
-using SixLabors.ImageSharp.Advanced;
-using SixLabors.ImageSharp.Formats;
-using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.Primitives;
-
-namespace SixLabors.ImageSharp.Helpers
-{
-    /// <summary>
-    /// Extension methods over Image{TPixel}
-    /// </summary>
-    public static partial class ImageExtensions
-    {
-        /// <summary>
-        /// Gets the bounds of the image.
-        /// </summary>
-        /// <typeparam name="TPixel">The Pixel format.</typeparam>
-        /// <param name="source">The source image</param>
-        /// <returns>Returns the bounds of the image</returns>
-        public static Rectangle Bounds<TPixel>(this Image<TPixel> source)
-            where TPixel : struct, IPixel<TPixel>
-            => new Rectangle(0, 0, source.Width, source.Height);
-
-        /// <summary>
-        /// Gets the bounds of the image.
-        /// </summary>
-        /// <typeparam name="TPixel">The Pixel format.</typeparam>
-        /// <param name="source">The source image</param>
-        /// <returns>Returns the bounds of the image</returns>
-        public static Rectangle Bounds<TPixel>(this ImageFrame<TPixel> source)
-            where TPixel : struct, IPixel<TPixel>
-            => new Rectangle(0, 0, source.Width, source.Height);
-
-        /// <summary>
-        /// Gets the size of the image.
-        /// </summary>
-        /// <typeparam name="TPixel">The Pixel format.</typeparam>
-        /// <param name="source">The source image</param>
-        /// <returns>Returns the bounds of the image</returns>
-        public static Size Size<TPixel>(this Image<TPixel> source)
-            where TPixel : struct, IPixel<TPixel>
-            => new Size(source.Width, source.Height);
-
-        /// <summary>
-        /// Gets the size of the image.
-        /// </summary>
-        /// <typeparam name="TPixel">The Pixel format.</typeparam>
-        /// <param name="source">The source image</param>
-        /// <returns>Returns the bounds of the image</returns>
-        public static Size Size<TPixel>(this ImageFrame<TPixel> source)
-            where TPixel : struct, IPixel<TPixel>
-            => new Size(source.Width, source.Height);
-    }
-}

src/ImageSharp/IImage.cs

@@ -0,0 +1,26 @@
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+using System;
+using SixLabors.Primitives;
+
+namespace SixLabors.ImageSharp
+{
+    /// <summary>
+    /// Encapsulates the properties and methods that describe an image.
+    /// </summary>
+    public interface IImage : IImageInfo, IDisposable
+    {
+        /// <summary>
+        /// Gets the size of the image.
+        /// </summary>
+        /// <returns>The <see cref="Size"/></returns>
+        Size Size();
+
+        /// <summary>
+        /// Gets the bounds of the image.
+        /// </summary>
+        /// <returns>The <see cref="Rectangle"/></returns>
+        Rectangle Bounds();
+    }
+}

src/ImageSharp/Image/IImage.cs

@@ -1,14 +0,0 @@
-// Copyright (c) Six Labors and contributors.
-// Licensed under the Apache License, Version 2.0.
-
-using System;
-
-namespace SixLabors.ImageSharp
-{
-    /// <summary>
-    /// Encapsulates the properties and methods that describe an image.
-    /// </summary>
-    public interface IImage : IImageInfo, IDisposable
-    {
-    }
-}

src/ImageSharp/Image/ImageFrame{TPixel}.cs → src/ImageSharp/ImageFrame{TPixel}.cs

@@ -2,12 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
-using System.Diagnostics;
 using System.Numerics;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
 using SixLabors.ImageSharp.Advanced;
-using SixLabors.ImageSharp.Helpers;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.MetaData;
 using SixLabors.ImageSharp.PixelFormats;
@@ -104,7 +102,7 @@ namespace SixLabors.ImageSharp
         /// <summary>
         /// Gets the meta data of the frame.
         /// </summary>
-        public ImageFrameMetaData MetaData { get; private set; }
+        public ImageFrameMetaData MetaData { get; }
 
         /// <summary>
         /// Gets or sets the pixel at the specified position.
@@ -127,6 +125,18 @@ namespace SixLabors.ImageSharp
             }
         }
 
+        /// <summary>
+        /// Gets the size of the frame.
+        /// </summary>
+        /// <returns>The <see cref="Size"/></returns>
+        public Size Size() => new Size(this.Width, this.Height);
+
+        /// <summary>
+        /// Gets the bounds of the frame.
+        /// </summary>
+        /// <returns>The <see cref="Rectangle"/></returns>
+        public Rectangle Bounds() => new Rectangle(0, 0, this.Width, this.Height);
+
         /// <summary>
         /// Gets a reference to the pixel at the specified position.
         /// </summary>
@@ -168,7 +178,7 @@ namespace SixLabors.ImageSharp
         {
             if (this.Size() != target.Size())
             {
-                throw new ArgumentException("ImageFrame<T>.CopyTo(): target must be of the same size!", nameof(target));
+                throw new ArgumentException("ImageFrame<TPixel>.CopyTo(): target must be of the same size!", nameof(target));
             }
 
             SpanHelper.Copy(this.GetPixelSpan(), target.Span);

src/ImageSharp/Image/Image{TPixel}.cs → src/ImageSharp/Image{TPixel}.cs

@@ -10,6 +10,7 @@ using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.Formats;
 using SixLabors.ImageSharp.MetaData;
 using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.Primitives;
 
 namespace SixLabors.ImageSharp
 {
@@ -20,8 +21,8 @@ namespace SixLabors.ImageSharp
     public sealed partial class Image<TPixel> : IImage, IConfigurable
         where TPixel : struct, IPixel<TPixel>
     {
-        private Configuration configuration;
+        private readonly Configuration configuration;
-        private ImageFrameCollection<TPixel> frames;
+        private readonly ImageFrameCollection<TPixel> frames;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="Image{TPixel}"/> class
@@ -44,7 +45,7 @@ namespace SixLabors.ImageSharp
         /// <param name="width">The width of the image in pixels.</param>
         /// <param name="height">The height of the image in pixels.</param>
         public Image(int width, int height)
-            : this(null, width, height)
+            : this(Configuration.Default, width, height)
         {
         }
 
@@ -97,7 +98,7 @@ namespace SixLabors.ImageSharp
         public int Height => this.frames.RootFrame.Height;
 
         /// <inheritdoc/>
-        public ImageMetaData MetaData { get; private set; } = new ImageMetaData();
+        public ImageMetaData MetaData { get; }
 
         /// <summary>
         /// Gets the frames.
@@ -122,6 +123,12 @@ namespace SixLabors.ImageSharp
             set => this.PixelSource.PixelBuffer[x, y] = value;
         }
 
+        /// <inheritdoc/>
+        public Size Size() => new Size(this.Width, this.Height);
+
+        /// <inheritdoc/>
+        public Rectangle Bounds() => new Rectangle(0, 0, this.Width, this.Height);
+
         /// <summary>
         /// Saves the image to the given stream using the given image encoder.
         /// </summary>

src/ImageSharp/Processing/Binarization/Processors/BinaryErrorDiffusionProcessor.cs

@@ -3,7 +3,6 @@
 
 using System;
 using SixLabors.ImageSharp.Advanced;
-using SixLabors.ImageSharp.Helpers;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing.Dithering.ErrorDiffusion;
 using SixLabors.ImageSharp.Processing.Processors;

src/ImageSharp/Processing/Binarization/Processors/BinaryOrderedDitherProcessor.cs

@@ -3,7 +3,6 @@
 
 using System;
 using SixLabors.ImageSharp.Advanced;
-using SixLabors.ImageSharp.Helpers;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing.Dithering.Ordered;
 using SixLabors.ImageSharp.Processing.Processors;

src/ImageSharp/Processing/Binarization/Processors/BinaryThresholdProcessor.cs

@@ -4,7 +4,6 @@
 using System;
 using System.Threading.Tasks;
 using SixLabors.ImageSharp.Advanced;
-using SixLabors.ImageSharp.Helpers;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing.Processors;
 using SixLabors.Primitives;

src/ImageSharp/Processing/Convolution/Processors/Convolution2PassProcessor.cs

@@ -4,7 +4,6 @@
 using System;
 using System.Numerics;
 using System.Threading.Tasks;
-using SixLabors.ImageSharp.Helpers;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Primitives;
@@ -63,7 +62,7 @@ namespace SixLabors.ImageSharp.Processing.Convolution.Processors
         /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to draw.
         /// </param>
         /// <param name="kernel">The kernel operator.</param>
-        /// <param name="parallelOptions">The parellel options</param>
+        /// <param name="parallelOptions">The parallel options</param>
         private void ApplyConvolution(
             Buffer2D<TPixel> targetPixels,
             Buffer2D<TPixel> sourcePixels,

src/ImageSharp/Processing/Convolution/Processors/ConvolutionProcessor.cs

@@ -5,7 +5,6 @@ using System;
 using System.Numerics;
 using System.Threading.Tasks;
 using SixLabors.ImageSharp.Advanced;
-using SixLabors.ImageSharp.Helpers;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Primitives;

src/ImageSharp/Processing/DefaultInternalImageProcessorContext.cs

@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.Advanced;
-using SixLabors.ImageSharp.Helpers;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing.Processors;
@@ -81,9 +80,6 @@ namespace SixLabors.ImageSharp.Processing
             return this.ApplyProcessor(processor, this.GetCurrentBounds());
         }
 
-        private Rectangle GetCurrentBounds()
+        private Rectangle GetCurrentBounds() => this.destination?.Bounds() ?? this.source.Bounds();
-        {
-            return this.destination?.Bounds() ?? this.source.Bounds();
-        }
     }
 }

src/ImageSharp/Processing/Dithering/Processors/ErrorDiffusionPaletteProcessor.cs

@@ -3,7 +3,6 @@
 
 using System;
 using SixLabors.ImageSharp.Advanced;
-using SixLabors.ImageSharp.Helpers;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing.Dithering.ErrorDiffusion;
 using SixLabors.ImageSharp.Processing.Processors;

src/ImageSharp/Processing/Dithering/Processors/OrderedDitherPaletteProcessor.cs

@@ -3,7 +3,6 @@
 
 using System;
 using SixLabors.ImageSharp.Advanced;
-using SixLabors.ImageSharp.Helpers;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing.Dithering.Ordered;
 using SixLabors.ImageSharp.Processing.Processors;

src/ImageSharp/Processing/Effects/Processors/OilPaintingProcessor.cs

@@ -5,7 +5,6 @@ using System;
 using System.Numerics;
 using System.Threading.Tasks;
 using SixLabors.ImageSharp.Advanced;
-using SixLabors.ImageSharp.Helpers;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing.Processors;

src/ImageSharp/Processing/Filters/Processors/FilterProcessor.cs

@@ -5,7 +5,6 @@ using System;
 using System.Numerics;
 using System.Threading.Tasks;
 using SixLabors.ImageSharp.Advanced;
-using SixLabors.ImageSharp.Helpers;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing.Processors;
 using SixLabors.Primitives;

src/ImageSharp/Processing/Overlays/Processors/GlowProcessor.cs

@@ -5,7 +5,6 @@ using System;
 using System.Numerics;
 using System.Threading.Tasks;
 using SixLabors.ImageSharp.Advanced;
-using SixLabors.ImageSharp.Helpers;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Primitives;

src/ImageSharp/Processing/Overlays/Processors/VignetteProcessor.cs

@@ -5,7 +5,6 @@ using System;
 using System.Numerics;
 using System.Threading.Tasks;
 using SixLabors.ImageSharp.Advanced;
-using SixLabors.ImageSharp.Helpers;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Primitives;
@@ -92,8 +91,9 @@ namespace SixLabors.ImageSharp.Processing.Overlays.Processors
             TPixel vignetteColor = this.VignetteColor;
             Vector2 centre = Rectangle.Center(sourceRectangle);
 
-            float finalRadiusX = this.RadiusX.Calculate(source.Size());
+            Size sourceSize = source.Size();
-            float finalRadiusY = this.RadiusY.Calculate(source.Size());
+            float finalRadiusX = this.RadiusX.Calculate(sourceSize);
+            float finalRadiusY = this.RadiusY.Calculate(sourceSize);
             float rX = finalRadiusX > 0 ? MathF.Min(finalRadiusX, sourceRectangle.Width * .5F) : sourceRectangle.Width * .5F;
             float rY = finalRadiusY > 0 ? MathF.Min(finalRadiusY, sourceRectangle.Height * .5F) : sourceRectangle.Height * .5F;
             float maxDistance = MathF.Sqrt((rX * rX) + (rY * rY));

src/ImageSharp/Processing/Transforms/Processors/AffineTransformProcessor.cs

@@ -7,7 +7,6 @@ using System.Linq;
 using System.Numerics;
 using System.Threading.Tasks;
 using SixLabors.ImageSharp.Advanced;
-using SixLabors.ImageSharp.Helpers;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing.Transforms.Resamplers;

src/ImageSharp/Processing/Transforms/Processors/FlipProcessor.cs

@@ -4,7 +4,6 @@
 using System;
 using System.Threading.Tasks;
 using SixLabors.ImageSharp.Advanced;
-using SixLabors.ImageSharp.Helpers;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing.Processors;

src/ImageSharp/Processing/Transforms/Processors/ProjectiveTransformProcessor.cs

@@ -7,7 +7,6 @@ using System.Linq;
 using System.Numerics;
 using System.Threading.Tasks;
 using SixLabors.ImageSharp.Advanced;
-using SixLabors.ImageSharp.Helpers;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing.Transforms.Resamplers;

src/ImageSharp/Processing/Transforms/Processors/RotateProcessor.cs

@@ -4,7 +4,6 @@
 using System;
 using System.Threading.Tasks;
 using SixLabors.ImageSharp.Advanced;
-using SixLabors.ImageSharp.Helpers;
 using SixLabors.ImageSharp.MetaData.Profiles.Exif;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing.Transforms.Resamplers;

tests/ImageSharp.Benchmarks/Samplers/Glow.cs

@@ -10,14 +10,12 @@ namespace SixLabors.ImageSharp.Benchmarks
     using SixLabors.ImageSharp.PixelFormats;
 
     using CoreSize = SixLabors.Primitives.Size;
-    using SixLabors.ImageSharp.Processing;
     using System.Numerics;
     using System;
     using System.Threading.Tasks;
 
     using SixLabors.ImageSharp.Memory;
     using SixLabors.Primitives;
-    using SixLabors.ImageSharp.Helpers;
     using SixLabors.ImageSharp.Processing.Overlays.Processors;
     using SixLabors.ImageSharp.Processing.Processors;
 

tests/ImageSharp.Tests/Drawing/DrawImageTest.cs

@@ -3,7 +3,6 @@
 
 using System;
 using System.Numerics;
-using SixLabors.ImageSharp.Helpers;
 using SixLabors.ImageSharp.Processing;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Primitives;

tests/ImageSharp.Tests/FakeImageOperationsProvider.cs

@@ -3,7 +3,6 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using SixLabors.ImageSharp.Helpers;
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;

tests/ImageSharp.Tests/Formats/Jpg/GenericBlock8x8Tests.cs

@@ -2,12 +2,9 @@
 namespace SixLabors.ImageSharp.Tests.Formats.Jpg
 {
     using System;
-    using System.Numerics;
 
     using SixLabors.ImageSharp.Formats.Jpeg.Common;
-    using SixLabors.ImageSharp.Helpers;
     using SixLabors.ImageSharp.PixelFormats;
-    using SixLabors.Primitives;
 
     using Xunit;
 

tests/ImageSharp.Tests/Image/ImageRotationTests.cs

@@ -1,7 +1,6 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-using SixLabors.ImageSharp.Helpers;
 using SixLabors.Primitives;
 using Xunit;
 

tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeTests.cs

@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
-using SixLabors.ImageSharp.Helpers;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
 using SixLabors.ImageSharp.Processing.Transforms.Resamplers;

tests/ImageSharp.Tests/Processing/Transforms/AffineTransformTests.cs

@@ -7,7 +7,6 @@ using SixLabors.ImageSharp.Processing.Transforms.Resamplers;
 using SixLabors.Primitives;
 using Xunit;
 using Xunit.Abstractions;
-using SixLabors.ImageSharp.Helpers;
 // ReSharper disable InconsistentNaming
 
 namespace SixLabors.ImageSharp.Tests.Processing.Transforms

tests/ImageSharp.Tests/TestUtilities/ImageComparison/ExactImageComparer.cs

@@ -3,7 +3,6 @@ namespace SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison
     using System;
     using System.Collections.Generic;
     using SixLabors.ImageSharp.Advanced;
-    using SixLabors.ImageSharp.Helpers;
     using SixLabors.ImageSharp.PixelFormats;
 
     using SixLabors.Primitives;

tests/ImageSharp.Tests/TestUtilities/ImageComparison/ImageComparer.cs

@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using SixLabors.ImageSharp.Helpers;
 using SixLabors.ImageSharp.PixelFormats;
 
 using SixLabors.Primitives;

tests/ImageSharp.Tests/TestUtilities/ImageComparison/TolerantImageComparer.cs

@@ -5,7 +5,6 @@
     using System.Runtime.CompilerServices;
 
     using SixLabors.ImageSharp.Advanced;
-    using SixLabors.ImageSharp.Helpers;
     using SixLabors.ImageSharp.PixelFormats;
 
     using SixLabors.Primitives;