Normalize and fix build

Author: JimBobSquarePants

src/ImageSharp.Drawing/Processing/Brush.cs

@@ -36,5 +36,8 @@ public abstract BrushApplicator<TPixel> CreateApplicator<TPixel>(
             ImageFrame<TPixel> source,
             RectangleF region)
             where TPixel : unmanaged, IPixel<TPixel>;
+
+        /// <inheritdoc/>
+        public abstract bool Equals(Brush other);
     }
 }

src/ImageSharp.Drawing/Processing/GradientBrush.cs

@@ -37,23 +37,15 @@ protected GradientBrush(GradientRepetitionMode repetitionMode, params ColorStop[
         /// <inheritdoc />
         public override bool Equals(Brush other)
         {
-            if (other is GradientBrush sb)
+            if (other is GradientBrush brush)
             {
-                return sb.RepetitionMode == this.RepetitionMode &&
-                    Enumerable.SequenceEqual(sb.ColorStops, this.ColorStops);
+                return this.RepetitionMode == brush.RepetitionMode
+                    && this.ColorStops?.SequenceEqual(brush.ColorStops) == true;
             }
 
             return false;
         }
 
-        /// <inheritdoc />
-        public abstract BrushApplicator<TPixel> CreateApplicator<TPixel>(
-            Configuration configuration,
-            GraphicsOptions options,
-            ImageFrame<TPixel> source,
-            RectangleF region)
-            where TPixel : unmanaged, IPixel<TPixel>;
-
         /// <summary>
         /// Base class for gradient brush applicators
         /// </summary>
@@ -124,7 +116,7 @@ protected GradientBrushApplicator(
 
                             break;
                         case GradientRepetitionMode.DontFill:
-                            if (positionOnCompleteGradient > 1 || positionOnCompleteGradient < 0)
+                            if (positionOnCompleteGradient is > 1 or < 0)
                             {
                                 return Transparent;
                             }

src/ImageSharp.Drawing/Processing/IPen.cs

@@ -14,7 +14,6 @@ namespace SixLabors.ImageSharp.Drawing.Processing
     public sealed class LinearGradientBrush : GradientBrush
     {
         private readonly PointF p1;
-
         private readonly PointF p2;
 
         /// <summary>
@@ -35,6 +34,19 @@ public LinearGradientBrush(
             this.p2 = p2;
         }
 
+        /// <inheritdoc/>
+        public override bool Equals(Brush other)
+        {
+            if (other is LinearGradientBrush brush)
+            {
+                return base.Equals(other)
+                    && this.p1.Equals(brush.p1)
+                    && this.p2.Equals(brush.p2);
+            }
+
+            return false;
+        }
+
         /// <inheritdoc />
         public override BrushApplicator<TPixel> CreateApplicator<TPixel>(
             Configuration configuration,

src/ImageSharp.Drawing/Processing/LinearGradientBrush.cs

@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Numerics;
 using SixLabors.ImageSharp.Drawing.Utilities;
@@ -81,9 +80,11 @@ public PathGradientBrush(PointF[] points, Color[] colors, Color centerColor)
         /// <inheritdoc />
         public override bool Equals(Brush other)
         {
-            if (other is PathGradientBrush sb)
+            if (other is PathGradientBrush brush)
             {
-                return Enumerable.SequenceEqual(sb.edges, this.edges);
+                return this.centerColor.Equals(brush.centerColor)
+                    && this.hasSpecialCenterColor.Equals(brush.hasSpecialCenterColor)
+                    && this.edges?.SequenceEqual(brush.edges) == true;
             }
 
             return false;
@@ -364,7 +365,7 @@ protected override void Dispose(bool disposing)
                     }
                 }
 
-                return closestEdge != null ? (closestEdge, closestIntersection) : ((Edge Edge, Vector2 Point)?)null;
+                return closestEdge != null ? (closestEdge, closestIntersection) : null;
             }
 
             private static bool FindPointOnTriangle(Vector2 v1, Vector2 v2, Vector2 v3, Vector2 point, out float u, out float v)

src/ImageSharp.Drawing/Processing/PathGradientBrush.cs

@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
-using System.Linq;
 using System.Numerics;
 using SixLabors.ImageSharp.Drawing.Utilities;
 using SixLabors.ImageSharp.Memory;
@@ -92,8 +91,8 @@ public override bool Equals(Brush other)
         {
             if (other is PatternBrush sb)
             {
-                return sb.pattern.Equals(this.pattern) &&
-                    sb.patternVector.Equals(this.patternVector);
+                return sb.pattern.Equals(this.pattern)
+                    && sb.patternVector.Equals(this.patternVector);
             }
 
             return false;

src/ImageSharp.Drawing/Processing/PatternBrush.cs

@@ -1,173 +1,77 @@
 // Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
-using System;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-
 namespace SixLabors.ImageSharp.Drawing.Processing
 {
     /// <summary>
-    /// Provides a pen that can apply a pattern to a line with a set brush and thickness
+    /// Defines a pen that can apply a pattern to a line with a set brush and thickness
     /// </summary>
     /// <remarks>
-    /// The pattern will be in to the form of new float[]{ 1f, 2f, 0.5f} this will be
-    /// converted into a pattern that is 3.5 times longer that the width with 3 sections
-    /// section 1 will be width long (making a square) and will be filled by the brush
-    /// section 2 will be width * 2 long and will be empty
-    /// section 3 will be width/2 long and will be filled
-    /// the pattern will immediately repeat without gap.
+    /// The pattern will be in to the form of <code>new float[]{ 1f, 2f, 0.5f}</code> this will be
+    /// converted into a pattern that is 3.5 times longer that the width with 3 sections.
+    /// <list type="bullet">
+    /// <item>Section 1 will be width long (making a square) and will be filled by the brush.</item>
+    /// <item>Section 2 will be width * 2 long and will be empty.</item>
+    /// <item>ection 3 will be width/2 long and will be filled.</item>
+    /// </list>
+    /// The pattern will immediately repeat without gap.
     /// </remarks>
-    public class PatternPen : IPen
+    public class PatternPen : Pen
     {
-        private readonly float[] pattern;
-
         /// <summary>
         /// Initializes a new instance of the <see cref="PatternPen"/> class.
         /// </summary>
         /// <param name="color">The color.</param>
-        /// <param name="width">The width.</param>
-        /// <param name="pattern">The pattern.</param>
-        public PatternPen(Color color, float width, float[] pattern)
-            : this(new SolidBrush(color), width, pattern)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PatternPen"/> class.
-        /// </summary>
-        /// <param name="brush">The brush.</param>
-        /// <param name="width">The width.</param>
-        /// <param name="pattern">The pattern.</param>
-        public PatternPen(IBrush brush, float width, float[] pattern)
-        {
-            Guard.MustBeGreaterThan(width, 0, nameof(width));
-
-            this.StrokeFill = brush;
-            this.StrokeWidth = width;
-            this.pattern = pattern;
-        }
-
-        /// <inheritdoc/>
-        public IBrush StrokeFill { get; }
-
-        /// <summary>
-        /// Gets the width to apply to the stroke
-        /// </summary>
-        public float? StrokeWidth { get; }
-
-        /// <summary>
-        /// Gets the stoke pattern.
-        /// </summary>
-        public ReadOnlySpan<float> StrokePattern => this.pattern;
-
-        /// <summary>
-        /// Gets or sets the stroke joint style
-        /// </summary>
-        public JointStyle JointStyle { get; set; }
-
-        /// <summary>
-        /// Gets or sets the stroke endcap style
-        /// </summary>
-        public EndCapStyle EndCapStyle { get; set; }
-
-        /// <inheritdoc/>
-        public bool Equals(IPen other)
-        {
-            if (other is PatternPen p)
-            {
-                return p.StrokeWidth == this.StrokeWidth &&
-                p.JointStyle == this.JointStyle &&
-                p.EndCapStyle == this.EndCapStyle &&
-                p.StrokeFill.Equals(this.StrokeFill) &&
-                Enumerable.SequenceEqual(p.pattern, this.pattern);
-            }
-
-            return false;
-        }
-
-        /// <inheritdoc />
-        public IPath GeneratePath(IPath path, float? defaultWidth = null)
-            => path.GenerateOutline(this.StrokeWidth ?? defaultWidth ?? 1, this.StrokePattern, this.JointStyle, this.EndCapStyle);
-    }
-
-   /// <summary>
-    /// Provides a pen that can apply a pattern to a line with a set brush and thickness
-    /// </summary>
-    /// <remarks>
-    /// The pattern will be in to the form of new float[]{ 1f, 2f, 0.5f} this will be
-    /// converted into a pattern that is 3.5 times longer that the width with 3 sections
-    /// section 1 will be width long (making a square) and will be filled by the brush
-    /// section 2 will be width * 2 long and will be empty
-    /// section 3 will be width/2 long and will be filled
-    /// the pattern will immediately repeat without gap.
-    /// </remarks>
-    public sealed class Pen
-    {
-        private readonly float[] pattern;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PatternPen"/> class.
-        /// </summary>
-        /// <param name="strokeFill">The brush used to fill the stroke outline.</param>
-        public Pen(Brush strokeFill)
-            : this(strokeFill, 1)
+        /// <param name="strokePattern">The stroke pattern.</param>
+        public PatternPen(Color color, float[] strokePattern)
+            : base(new SolidBrush(color), 1, strokePattern)
         {
         }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="PatternPen"/> class.
         /// </summary>
-        /// <param name="strokeFill">The brush used to fill the stroke outline.</param>
+        /// <param name="color">The color.</param>
         /// <param name="strokeWidth">The stroke width in px units.</param>
-        public Pen(Brush strokeFill, float strokeWidth)
-            : this(strokeFill, strokeWidth, Pens.EmptyPattern)
+        /// <param name="strokePattern">The stroke pattern.</param>
+        public PatternPen(Color color, float strokeWidth, float[] strokePattern)
+            : base(new SolidBrush(color), strokeWidth, strokePattern)
         {
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="Pen"/> class.
+        /// Initializes a new instance of the <see cref="PatternPen"/> class.
         /// </summary>
         /// <param name="strokeFill">The brush used to fill the stroke outline.</param>
         /// <param name="strokeWidth">The stroke width in px units.</param>
         /// <param name="strokePattern">The stroke pattern.</param>
-        private Pen(Brush strokeFill, float strokeWidth, float[] strokePattern)
+        public PatternPen(Brush strokeFill, float strokeWidth, float[] strokePattern)
+            : base(strokeFill, strokeWidth, strokePattern)
         {
-            Guard.MustBeGreaterThan(strokeWidth, 0, nameof(strokeWidth));
-
-            this.StrokeFill = strokeFill;
-            this.StrokeWidth = strokeWidth;
-            this.pattern = strokePattern;
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="Pen"/> class.
+        /// Initializes a new instance of the <see cref="PatternPen"/> class.
         /// </summary>
         /// <param name="options">The pen options.</param>
-        public Pen(PenOptions options)
+        public PatternPen(PenOptions options)
+            : base(options)
         {
-            Guard.NotNull(options, nameof(options));
-
-            this.StrokeFill = options.StrokeFill;
-            this.StrokeWidth = options.StrokeWidth;
-            this.pattern = options.StrokePattern;
-            this.JointStyle = options.JointStyle;
-            this.EndCapStyle = options.EndCapStyle;
         }
 
-        /// <inheritdoc cref="PenOptions.StrokeFill"/>
-        public Brush StrokeFill { get; }
-
-        /// <inheritdoc cref="PenOptions.StrokeWidth"/>
-        public float StrokeWidth { get; }
-
-        /// <inheritdoc cref="PenOptions.StrokePattern"/>
-        public ReadOnlySpan<float> StrokePattern => this.pattern;
+        /// <inheritdoc/>
+        public override bool Equals(Pen other)
+        {
+            if (other is PatternPen)
+            {
+                return base.Equals(other);
+            }
 
-        /// <inheritdoc cref="PenOptions.JointStyle"/>
-        public JointStyle JointStyle { get; }
+            return false;
+        }
 
-        /// <inheritdoc cref="PenOptions.EndCapStyle"/>
-        public EndCapStyle EndCapStyle { get; }
+        /// <inheritdoc />
+        public override IPath GeneratePath(IPath path, float strokeWidth)
+            => path.GenerateOutline(strokeWidth, this.StrokePattern, this.JointStyle, this.EndCapStyle);
     }
 }