API cleanup (related to SixLabors#907) (SixLabors#911)

* temporarily disable target frameworks

* drop DelegateProcessor

* drop IImageProcessingContext<TPixel>

* drop NamedColors<T>

* drop ColorBuilder<T>

* drop the *Base postfix for clean class hierarchies

* re-enable target frameworks

* use MathF in gradient brushes

* Move PngFilterMethod to the correct namespace.

Author: antonfirsov

src/ImageSharp.Drawing/Processing/EllipticGradientBrush.cs

@@ -14,15 +14,15 @@ namespace SixLabors.ImageSharp.Processing
     /// a point on the longest extension of the ellipse and
     /// the ratio between longest and shortest extension.
     /// </summary>
-    public sealed class EllipticGradientBrush : GradientBrushBase
+    public sealed class EllipticGradientBrush : GradientBrush
     {
         private readonly PointF center;
 
         private readonly PointF referenceAxisEnd;
 
         private readonly float axisRatio;
 
-        /// <inheritdoc cref="GradientBrushBase" />
+        /// <inheritdoc cref="GradientBrush" />
         /// <param name="center">The center of the elliptical gradient and 0 for the color stops.</param>
         /// <param name="referenceAxisEnd">The end point of the reference axis of the ellipse.</param>
         /// <param name="axisRatio">
@@ -60,7 +60,7 @@ public override BrushApplicator<TPixel> CreateApplicator<TPixel>(
                 this.RepetitionMode);
 
         /// <inheritdoc />
-        private sealed class RadialGradientBrushApplicator<TPixel> : GradientBrushApplicatorBase<TPixel>
+        private sealed class RadialGradientBrushApplicator<TPixel> : GradientBrushApplicator<TPixel>
             where TPixel : struct, IPixel<TPixel>
         {
             private readonly PointF center;
@@ -149,8 +149,7 @@ private float AngleBetween(PointF junction, PointF a, PointF b)
             {
                 var vA = a - junction;
                 var vB = b - junction;
-                return (float)(Math.Atan2(vB.Y, vB.X)
-                       - Math.Atan2(vA.Y, vA.X));
+                return MathF.Atan2(vB.Y, vB.X) - MathF.Atan2(vA.Y, vA.X);
             }
 
             private float DistanceBetween(
@@ -162,7 +161,7 @@ private float DistanceBetween(
 
                 float dY = p1.Y - p2.Y;
                 float dYsquared = dY * dY;
-                return (float)Math.Sqrt(dXsquared + dYsquared);
+                return MathF.Sqrt(dXsquared + dYsquared);
             }
         }
     }

….Drawing/Processing/GradientBrushBase.cs …harp.Drawing/Processing/GradientBrush.cssrc/ImageSharp.Drawing/Processing/GradientBrushBase.cs renamed to src/ImageSharp.Drawing/Processing/GradientBrush.cs src/ImageSharp.Drawing/Processing/GradientBrushBase.cs renamed to src/ImageSharp.Drawing/Processing/GradientBrush.cs

@@ -13,12 +13,12 @@ namespace SixLabors.ImageSharp.Processing
     /// <summary>
     /// Base class for Gradient brushes
     /// </summary>
-    public abstract class GradientBrushBase : IBrush
+    public abstract class GradientBrush : IBrush
     {
         /// <inheritdoc cref="IBrush"/>
         /// <param name="repetitionMode">Defines how the colors are repeated beyond the interval [0..1]</param>
         /// <param name="colorStops">The gradient colors.</param>
-        protected GradientBrushBase(
+        protected GradientBrush(
             GradientRepetitionMode repetitionMode,
             params ColorStop[] colorStops)
         {
@@ -46,7 +46,7 @@ public abstract BrushApplicator<TPixel> CreateApplicator<TPixel>(
         /// <summary>
         /// Base class for gradient brush applicators
         /// </summary>
-        internal abstract class GradientBrushApplicatorBase<TPixel> : BrushApplicator<TPixel>
+        internal abstract class GradientBrushApplicator<TPixel> : BrushApplicator<TPixel>
             where TPixel : struct, IPixel<TPixel>
         {
             private static readonly TPixel Transparent = Color.Transparent.ToPixel<TPixel>();
@@ -56,13 +56,13 @@ internal abstract class GradientBrushApplicatorBase<TPixel> : BrushApplicator<TP
             private readonly GradientRepetitionMode repetitionMode;
 
             /// <summary>
-            /// Initializes a new instance of the <see cref="GradientBrushApplicatorBase{TPixel}"/> class.
+            /// Initializes a new instance of the <see cref="GradientBrushApplicator{TPixel}"/> class.
             /// </summary>
             /// <param name="target">The target.</param>
             /// <param name="options">The options.</param>
             /// <param name="colorStops">An array of color stops sorted by their position.</param>
             /// <param name="repetitionMode">Defines if and how the gradient should be repeated.</param>
-            protected GradientBrushApplicatorBase(
+            protected GradientBrushApplicator(
                 ImageFrame<TPixel> target,
                 GraphicsOptions options,
                 ColorStop[] colorStops,

src/ImageSharp.Drawing/Processing/LinearGradientBrush.cs

@@ -13,7 +13,7 @@ namespace SixLabors.ImageSharp.Processing
     /// Supported right now:
     /// - a set of colors in relative distances to each other.
     /// </summary>
-    public sealed class LinearGradientBrush : GradientBrushBase
+    public sealed class LinearGradientBrush : GradientBrush
     {
         private readonly PointF p1;
 
@@ -53,7 +53,7 @@ public override BrushApplicator<TPixel> CreateApplicator<TPixel>(
         /// <summary>
         /// The linear gradient brush applicator.
         /// </summary>
-        private sealed class LinearGradientBrushApplicator<TPixel> : GradientBrushApplicatorBase<TPixel>
+        private sealed class LinearGradientBrushApplicator<TPixel> : GradientBrushApplicator<TPixel>
             where TPixel : struct, IPixel<TPixel>
         {
             private readonly PointF start;
@@ -121,7 +121,7 @@ public LinearGradientBrushApplicator(
 
                 // some helpers:
                 this.alongsSquared = (this.alongX * this.alongX) + (this.alongY * this.alongY);
-                this.length = (float)Math.Sqrt(this.alongsSquared);
+                this.length = MathF.Sqrt(this.alongsSquared);
             }
 
             protected override float PositionOnGradient(float x, float y)
@@ -145,7 +145,7 @@ protected override float PositionOnGradient(float x, float y)
                     float y4 = y + (k * this.alongX);
 
                     // get distance from (x4,y4) to start
-                    float distance = (float)Math.Sqrt(Math.Pow(x4 - this.start.X, 2) + Math.Pow(y4 - this.start.Y, 2));
+                    float distance = MathF.Sqrt(MathF.Pow(x4 - this.start.X, 2) + MathF.Pow(y4 - this.start.Y, 2));
 
                     // get and return ratio
                     float ratio = distance / this.length;

src/ImageSharp.Drawing/Processing/RadialGradientBrush.cs

@@ -11,13 +11,13 @@ namespace SixLabors.ImageSharp.Processing
     /// <summary>
     /// A Circular Gradient Brush, defined by center point and radius.
     /// </summary>
-    public sealed class RadialGradientBrush : GradientBrushBase
+    public sealed class RadialGradientBrush : GradientBrush
     {
         private readonly PointF center;
 
         private readonly float radius;
 
-        /// <inheritdoc cref="GradientBrushBase" />
+        /// <inheritdoc cref="GradientBrush" />
         /// <param name="center">The center of the circular gradient and 0 for the color stops.</param>
         /// <param name="radius">The radius of the circular gradient and 1 for the color stops.</param>
         /// <param name="repetitionMode">Defines how the colors in the gradient are repeated.</param>
@@ -47,7 +47,7 @@ public override BrushApplicator<TPixel> CreateApplicator<TPixel>(
                 this.RepetitionMode);
 
         /// <inheritdoc />
-        private sealed class RadialGradientBrushApplicator<TPixel> : GradientBrushApplicatorBase<TPixel>
+        private sealed class RadialGradientBrushApplicator<TPixel> : GradientBrushApplicator<TPixel>
             where TPixel : struct, IPixel<TPixel>
         {
             private readonly PointF center;
@@ -90,7 +90,7 @@ public override void Dispose()
             /// <returns>the position on the color gradient.</returns>
             protected override float PositionOnGradient(float x, float y)
             {
-                float distance = (float)Math.Sqrt(Math.Pow(this.center.X - x, 2) + Math.Pow(this.center.Y - y, 2));
+                float distance = MathF.Sqrt(MathF.Pow(this.center.X - x, 2) + MathF.Pow(this.center.Y - y, 2));
                 return distance / this.radius;
             }
 

tests/ImageSharp.Tests/BaseImageOperationsExtensionTest.cs

@@ -11,7 +11,7 @@ namespace SixLabors.ImageSharp.Tests
 {
     public abstract class BaseImageOperationsExtensionTest
     {
-        protected readonly IImageProcessingContext<Rgba32> operations;
+        protected readonly IImageProcessingContext operations;
         private readonly FakeImageOperationsProvider.FakeImageOperations<Rgba32> internalOperations;
         protected readonly Rectangle rect;
         protected readonly GraphicsOptions options;

tests/ImageSharp.Tests/FakeImageOperationsProvider.cs

@@ -57,7 +57,7 @@ public FakeImageOperations(Image<TPixel> source, bool mutate)
 
             public MemoryAllocator MemoryAllocator => this.Source.GetConfiguration().MemoryAllocator;
 
-            public Image<TPixel> Apply()
+            public Image<TPixel> GetResultImage()
             {
                 return this.Source;
             }
@@ -86,25 +86,6 @@ public IImageProcessingContext ApplyProcessor(IImageProcessor processor)
                 return this;
             }
 
-            public IImageProcessingContext<TPixel> ApplyProcessor(IImageProcessor<TPixel> processor, Rectangle rectangle)
-            {
-                this.Applied.Add(new AppliedOperation
-                {
-                    GenericProcessor = processor,
-                    Rectangle = rectangle
-                });
-                return this;
-            }
-
-            public IImageProcessingContext<TPixel> ApplyProcessor(IImageProcessor<TPixel> processor)
-            {
-                this.Applied.Add(new AppliedOperation
-                {
-                    GenericProcessor = processor
-                });
-                return this;
-            }
-
             public struct AppliedOperation
             {
                 public Rectangle? Rectangle { get; set; }