Remove IPen make Pen sealed

stefannikolei · stefannikolei · commit b47e5208e2c5 · 2023-03-04T12:12:35.000+01:00
diff --git a/src/ImageSharp.Drawing/Processing/Extensions/DrawBezierExtensions.cs b/src/ImageSharp.Drawing/Processing/Extensions/DrawBezierExtensions.cs
@@ -21,7 +21,7 @@ public static class DrawBezierExtensions
         public static IImageProcessingContext DrawBeziers(
             this IImageProcessingContext source,
             DrawingOptions options,
-            IPen pen,
+            Pen pen,
             params PointF[] points) =>
             source.Draw(options, pen, new Path(new CubicBezierLineSegment(points)));
 
@@ -34,7 +34,7 @@ public static IImageProcessingContext DrawBeziers(
         /// <returns>The <see cref="IImageProcessingContext"/> to allow chaining of operations.</returns>
         public static IImageProcessingContext DrawBeziers(
             this IImageProcessingContext source,
-            IPen pen,
+            Pen pen,
             params PointF[] points) =>
             source.Draw(pen, new Path(new CubicBezierLineSegment(points)));
 
diff --git a/src/ImageSharp.Drawing/Processing/Extensions/DrawLineExtensions.cs b/src/ImageSharp.Drawing/Processing/Extensions/DrawLineExtensions.cs
@@ -85,7 +85,7 @@ public static IImageProcessingContext DrawLines(
         public static IImageProcessingContext DrawLines(
             this IImageProcessingContext source,
             DrawingOptions options,
-            IPen pen,
+            Pen pen,
             params PointF[] points) =>
             source.Draw(options, pen, new Path(new LinearLineSegment(points)));
 
@@ -98,7 +98,7 @@ public static IImageProcessingContext DrawLines(
         /// <returns>The <see cref="IImageProcessingContext"/> to allow chaining of operations.</returns>
         public static IImageProcessingContext DrawLines(
             this IImageProcessingContext source,
-            IPen pen,
+            Pen pen,
             params PointF[] points) =>
             source.Draw(pen, new Path(new LinearLineSegment(points)));
     }
diff --git a/src/ImageSharp.Drawing/Processing/Extensions/DrawPathCollectionExtensions.cs b/src/ImageSharp.Drawing/Processing/Extensions/DrawPathCollectionExtensions.cs
@@ -21,7 +21,7 @@ public static class DrawPathCollectionExtensions
         public static IImageProcessingContext Draw(
             this IImageProcessingContext source,
             DrawingOptions options,
-            IPen pen,
+            Pen pen,
             IPathCollection paths)
         {
             foreach (IPath path in paths)
@@ -40,7 +40,7 @@ public static IImageProcessingContext Draw(
         /// <param name="paths">The paths.</param>
         /// <returns>The <see cref="IImageProcessingContext"/> to allow chaining of operations.</returns>
         public static IImageProcessingContext
-            Draw(this IImageProcessingContext source, IPen pen, IPathCollection paths) =>
+            Draw(this IImageProcessingContext source, Pen pen, IPathCollection paths) =>
             source.Draw(source.GetDrawingOptions(), pen, paths);
 
         /// <summary>
diff --git a/src/ImageSharp.Drawing/Processing/Extensions/DrawPathExtensions.cs b/src/ImageSharp.Drawing/Processing/Extensions/DrawPathExtensions.cs
@@ -22,7 +22,7 @@ public static class DrawPathExtensions
         public static IImageProcessingContext Draw(
             this IImageProcessingContext source,
             DrawingOptions options,
-            IPen pen,
+            Pen pen,
             IPath path) =>
             source.ApplyProcessor(new DrawPathProcessor(options, pen, path));
 
@@ -33,7 +33,7 @@ public static IImageProcessingContext Draw(
         /// <param name="pen">The pen.</param>
         /// <param name="path">The path.</param>
         /// <returns>The <see cref="IImageProcessingContext"/> to allow chaining of operations.</returns>
-        public static IImageProcessingContext Draw(this IImageProcessingContext source, IPen pen, IPath path) =>
+        public static IImageProcessingContext Draw(this IImageProcessingContext source, Pen pen, IPath path) =>
             source.Draw(source.GetDrawingOptions(), pen, path);
 
         /// <summary>
diff --git a/src/ImageSharp.Drawing/Processing/Extensions/DrawPolygonExtensions.cs b/src/ImageSharp.Drawing/Processing/Extensions/DrawPolygonExtensions.cs
@@ -19,7 +19,7 @@ public static class DrawPolygonExtensions
         /// <returns>The <see cref="IImageProcessingContext"/> to allow chaining of operations.</returns>
         public static IImageProcessingContext DrawPolygon(
             this IImageProcessingContext source,
-            IPen pen,
+            Pen pen,
             params PointF[] points) =>
             source.Draw(source.GetDrawingOptions(), pen, new Polygon(new LinearLineSegment(points)));
 
@@ -34,7 +34,7 @@ public static IImageProcessingContext DrawPolygon(
         public static IImageProcessingContext DrawPolygon(
             this IImageProcessingContext source,
             DrawingOptions options,
-            IPen pen,
+            Pen pen,
             params PointF[] points) =>
             source.Draw(options, pen, new Polygon(new LinearLineSegment(points)));
 
diff --git a/src/ImageSharp.Drawing/Processing/Extensions/DrawRectangleExtensions.cs b/src/ImageSharp.Drawing/Processing/Extensions/DrawRectangleExtensions.cs
@@ -21,7 +21,7 @@ public static class DrawRectangleExtensions
         public static IImageProcessingContext Draw(
             this IImageProcessingContext source,
             DrawingOptions options,
-            IPen pen,
+            Pen pen,
             RectangleF shape) =>
             source.Draw(options, pen, new RectangularPolygon(shape.X, shape.Y, shape.Width, shape.Height));
 
@@ -32,7 +32,7 @@ public static IImageProcessingContext Draw(
         /// <param name="pen">The pen.</param>
         /// <param name="shape">The shape.</param>
         /// <returns>The <see cref="IImageProcessingContext"/> to allow chaining of operations.</returns>
-        public static IImageProcessingContext Draw(this IImageProcessingContext source, IPen pen, RectangleF shape) =>
+        public static IImageProcessingContext Draw(this IImageProcessingContext source, Pen pen, RectangleF shape) =>
             source.Draw(source.GetDrawingOptions(), pen, shape);
 
         /// <summary>
diff --git a/src/ImageSharp.Drawing/Processing/Extensions/DrawTextExtensions.cs b/src/ImageSharp.Drawing/Processing/Extensions/DrawTextExtensions.cs
@@ -93,7 +93,7 @@ public static IImageProcessingContext DrawText(
             this IImageProcessingContext source,
             string text,
             Font font,
-            IPen pen,
+            Pen pen,
             PointF location) =>
             source.DrawText(source.GetDrawingOptions(), text, font, pen, location);
 
@@ -112,7 +112,7 @@ public static IImageProcessingContext DrawText(
             string text,
             Font font,
             Brush brush,
-            IPen pen,
+            Pen pen,
             PointF location)
         {
             TextOptions textOptions = new(font) { Origin = location };
@@ -146,7 +146,7 @@ public static IImageProcessingContext DrawText(
             this IImageProcessingContext source,
             TextOptions textOptions,
             string text,
-            IPen pen) =>
+            Pen pen) =>
             source.DrawText(source.GetDrawingOptions(), textOptions, text, null, pen);
 
         /// <summary>
@@ -163,7 +163,7 @@ public static IImageProcessingContext DrawText(
             TextOptions textOptions,
             string text,
             Brush brush,
-            IPen pen) =>
+            Pen pen) =>
             source.DrawText(source.GetDrawingOptions(), textOptions, text, brush, pen);
 
         /// <summary>
@@ -181,7 +181,7 @@ public static IImageProcessingContext DrawText(
             DrawingOptions drawingOptions,
             string text,
             Font font,
-            IPen pen,
+            Pen pen,
             PointF location)
             => source.DrawText(drawingOptions, text, font, null, pen, location);
 
@@ -221,7 +221,7 @@ public static IImageProcessingContext DrawText(
             string text,
             Font font,
             Brush brush,
-            IPen pen,
+            Pen pen,
             PointF location)
         {
             TextOptions textOptions = new(font) { Origin = location };
@@ -244,7 +244,7 @@ public static IImageProcessingContext DrawText(
             TextOptions textOptions,
             string text,
             Brush brush,
-            IPen pen)
+            Pen pen)
             => source.ApplyProcessor(new DrawTextProcessor(drawingOptions, textOptions, text, brush, pen));
     }
 }
diff --git a/src/ImageSharp.Drawing/Processing/IPen.cs b/src/ImageSharp.Drawing/Processing/IPen.cs
diff --git a/src/ImageSharp.Drawing/Processing/Pen.cs b/src/ImageSharp.Drawing/Processing/Pen.cs
@@ -16,7 +16,7 @@ namespace SixLabors.ImageSharp.Drawing.Processing
     /// section 3 will be width/2 long and will be filled
     /// the pattern will immediately repeat without gap.
     /// </remarks>
-    public class Pen : IPen
+    public sealed class Pen
     {
         private readonly float[] pattern;
 
diff --git a/src/ImageSharp.Drawing/Processing/Processors/Drawing/DrawPathProcessor.cs b/src/ImageSharp.Drawing/Processing/Processors/Drawing/DrawPathProcessor.cs
@@ -19,7 +19,7 @@ public class DrawPathProcessor : IImageProcessor
         /// <param name="options">The graphics options.</param>
         /// <param name="pen">The details how to outline the region of interest.</param>
         /// <param name="path">The path to be filled.</param>
-        public DrawPathProcessor(DrawingOptions options, IPen pen, IPath path)
+        public DrawPathProcessor(DrawingOptions options, Pen pen, IPath path)
         {
             this.Path = path;
             this.Pen = pen;
@@ -29,7 +29,7 @@ public DrawPathProcessor(DrawingOptions options, IPen pen, IPath path)
         /// <summary>
         /// Gets the <see cref="Brush"/> used for filling the destination image.
         /// </summary>
-        public IPen Pen { get; }
+        public Pen Pen { get; }
 
         /// <summary>
         /// Gets the path that this processor applies to.
diff --git a/src/ImageSharp.Drawing/Processing/Processors/Text/DrawTextProcessor.cs b/src/ImageSharp.Drawing/Processing/Processors/Text/DrawTextProcessor.cs
@@ -21,7 +21,7 @@ public class DrawTextProcessor : IImageProcessor
         /// <param name="text">The text we want to render</param>
         /// <param name="brush">The brush to source pixel colors from.</param>
         /// <param name="pen">The pen to outline text with.</param>
-        public DrawTextProcessor(DrawingOptions drawingOptions, TextOptions textOptions, string text, Brush brush, IPen pen)
+        public DrawTextProcessor(DrawingOptions drawingOptions, TextOptions textOptions, string text, Brush brush, Pen pen)
         {
             Guard.NotNull(text, nameof(text));
             if (brush is null && pen is null)
@@ -59,7 +59,7 @@ public DrawTextProcessor(DrawingOptions drawingOptions, TextOptions textOptions,
         /// <summary>
         /// Gets the pen used for outlining the text, if Null then we will not outline
         /// </summary>
-        public IPen Pen { get; }
+        public Pen Pen { get; }
 
         /// <summary>
         /// Gets the location to draw the text at.
diff --git a/src/ImageSharp.Drawing/Processing/Processors/Text/DrawTextProcessor{TPixel}.cs b/src/ImageSharp.Drawing/Processing/Processors/Text/DrawTextProcessor{TPixel}.cs
@@ -174,7 +174,7 @@ private class CachingGlyphRenderer : IColorGlyphRenderer, IDisposable
             private readonly bool renderFill;
             private bool rasterizationRequired;
 
-            public CachingGlyphRenderer(MemoryAllocator memoryAllocator, int size, TextOptions textOptions, IPen pen, bool renderFill, Matrix3x2 transform)
+            public CachingGlyphRenderer(MemoryAllocator memoryAllocator, int size, TextOptions textOptions, Pen pen, bool renderFill, Matrix3x2 transform)
             {
                 this.MemoryAllocator = memoryAllocator;
                 this.currentRenderPosition = default;
@@ -202,7 +202,7 @@ public CachingGlyphRenderer(MemoryAllocator memoryAllocator, int size, TextOptio
 
             public MemoryAllocator MemoryAllocator { get; internal set; }
 
-            public IPen Pen { get; internal set; }
+            public Pen Pen { get; internal set; }
 
             public DrawingOptions Options { get; internal set; }
 
diff --git a/tests/ImageSharp.Drawing.Benchmarks/Drawing/DrawTextOutline.cs b/tests/ImageSharp.Drawing.Benchmarks/Drawing/DrawTextOutline.cs
@@ -10,6 +10,7 @@
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
 using Brush = SixLabors.ImageSharp.Drawing.Processing.Brush;
+using Pen = SixLabors.ImageSharp.Drawing.Processing.Pen;
 using SDRectangleF = System.Drawing.RectangleF;
 
 namespace SixLabors.ImageSharp.Drawing.Benchmarks.Drawing
@@ -94,7 +95,7 @@ static IImageProcessingContext DrawTextOldVersion(
                 TextOptions textOptions,
                 string text,
                 Brush brush,
-                IPen pen)
+                Pen pen)
             {
                 IPathCollection glyphs = TextBuilder.GenerateGlyphs(text, textOptions);
 
diff --git a/tests/ImageSharp.Drawing.Tests/Drawing/Paths/DrawBezier.cs b/tests/ImageSharp.Drawing.Tests/Drawing/Paths/DrawBezier.cs
@@ -11,7 +11,7 @@ namespace SixLabors.ImageSharp.Drawing.Tests.Drawing.Paths
 {
     public class DrawBezier : BaseImageOperationsExtensionTest
     {
-        private readonly IPen pen = Pens.Solid(Color.HotPink, 2);
+        private readonly Pen pen = Pens.Solid(Color.HotPink, 2);
         private readonly PointF[] points = new PointF[]
         {
             new PointF(10, 10),
diff --git a/tests/ImageSharp.Drawing.Tests/Drawing/Paths/DrawLine.cs b/tests/ImageSharp.Drawing.Tests/Drawing/Paths/DrawLine.cs
@@ -10,7 +10,7 @@ namespace SixLabors.ImageSharp.Drawing.Tests.Drawing.Paths
 {
     public class DrawLine : BaseImageOperationsExtensionTest
     {
-        private readonly IPen pen = Pens.Solid(Color.HotPink, 2);
+        private readonly Pen pen = Pens.Solid(Color.HotPink, 2);
         private readonly PointF[] points = new PointF[]
         {
             new PointF(10, 10),
diff --git a/tests/ImageSharp.Drawing.Tests/Drawing/Paths/DrawPath.cs b/tests/ImageSharp.Drawing.Tests/Drawing/Paths/DrawPath.cs
@@ -10,7 +10,7 @@ namespace SixLabors.ImageSharp.Drawing.Tests.Drawing.Paths
 {
     public class DrawPath : BaseImageOperationsExtensionTest
     {
-        private readonly IPen pen = Pens.Solid(Color.HotPink, 2);
+        private readonly Pen pen = Pens.Solid(Color.HotPink, 2);
         private readonly IPath path = new EllipsePolygon(10, 10, 100);
 
         [Fact]
diff --git a/tests/ImageSharp.Drawing.Tests/Drawing/Paths/DrawPolygon.cs b/tests/ImageSharp.Drawing.Tests/Drawing/Paths/DrawPolygon.cs
@@ -10,7 +10,7 @@ namespace SixLabors.ImageSharp.Drawing.Tests.Drawing.Paths
 {
     public class DrawPolygon : BaseImageOperationsExtensionTest
     {
-        private readonly IPen pen = Pens.Solid(Color.HotPink, 2);
+        private readonly Pen pen = Pens.Solid(Color.HotPink, 2);
         private readonly PointF[] points = new[]
         {
             new PointF(10, 10),
diff --git a/tests/ImageSharp.Drawing.Tests/Drawing/Paths/DrawRectangle.cs b/tests/ImageSharp.Drawing.Tests/Drawing/Paths/DrawRectangle.cs
@@ -11,7 +11,7 @@ namespace SixLabors.ImageSharp.Drawing.Tests.Drawing.Paths
 {
     public class DrawRectangle : BaseImageOperationsExtensionTest
     {
-        private readonly IPen pen = Pens.Solid(Color.HotPink, 2);
+        private readonly Pen pen = Pens.Solid(Color.HotPink, 2);
         private RectangleF rectangle = new RectangleF(10, 10, 20, 20);
 
         private RectangularPolygon RectanglePolygon => new RectangularPolygon(this.rectangle);
diff --git a/tests/ImageSharp.Drawing.Tests/Issues/Issue_54.cs b/tests/ImageSharp.Drawing.Tests/Issues/Issue_54.cs
@@ -35,7 +35,7 @@ public void CanDrawWithoutMemoryException()
                 };
 
                 Brush brush = Brushes.Solid(Color.White);
-                IPen pen = Pens.Solid(Color.White, 1);
+                Pen pen = Pens.Solid(Color.White, 1);
                 string text = "sample text";
 
                 // Draw the text
@@ -48,7 +48,7 @@ public void PenMustHaveAWidthGraterThanZero()
         {
             ArgumentOutOfRangeException ex = Assert.Throws<ArgumentOutOfRangeException>(() =>
             {
-                IPen pen = new Pen(Color.White, 0);
+                Pen pen = new Pen(Color.White, 0);
             });
 
             Assert.StartsWith("Parameter \"width\" (System.Single) must be greater than 0, was 0", ex.Message);
diff --git a/tests/ImageSharp.Drawing.Tests/TestUtilities/DebugDraw.cs b/tests/ImageSharp.Drawing.Tests/TestUtilities/DebugDraw.cs
@@ -13,7 +13,7 @@ internal class DebugDraw
     {
         private static readonly Brush TestBrush = Brushes.Solid(Color.Red);
 
-        private static readonly IPen GridPen = Pens.Solid(Color.Aqua, 0.5f);
+        private static readonly Pen GridPen = Pens.Solid(Color.Aqua, 0.5f);
 
         private readonly string outputDir;
 
diff --git a/tests/ImageSharp.Drawing.Tests/TestUtilities/PolygonFactory.cs b/tests/ImageSharp.Drawing.Tests/TestUtilities/PolygonFactory.cs
@@ -18,7 +18,7 @@ internal static class PolygonFactory
 
         private static readonly Brush TestBrush = Brushes.Solid(Color.Red);
 
-        private static readonly IPen GridPen = Pens.Solid(Color.Aqua, 0.5f);
+        private static readonly Pen GridPen = Pens.Solid(Color.Aqua, 0.5f);
 
         // based on:
         // https://github.com/SixLabors/ImageSharp.Drawing/issues/15#issuecomment-521061283

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ namespace SixLabors.ImageSharp.Drawing.Processing`
`16`	`16`	`/// section 3 will be width/2 long and will be filled`
`17`	`17`	`/// the pattern will immediately repeat without gap.`
`18`	`18`	`/// </remarks>`
`19`		`- public class Pen : IPen`
	`19`	`+ public sealed class Pen`
`20`	`20`	`{`
`21`	`21`	`private readonly float[] pattern;`
`22`	`22`