Fix merge conflicts and missing test output

Author: JimBobSquarePants

src/ImageSharp.Drawing/Common/Extensions/GraphicsOptionsExtensions.cs

@@ -38,7 +38,7 @@ public static bool IsOpaqueColorWithoutBlending(this GraphicsOptions options, Co
             return false;
         }
 
-        if (color.ToScaledVector4().W != Opaque)
+        if (color.ToScaledVector4().W != opaque)
         {
             return false;
         }

src/ImageSharp.Drawing/Processing/Pen.cs

@@ -52,11 +52,11 @@ protected Pen(Brush strokeFill, float strokeWidth, float[] strokePattern)
     {
         Guard.NotNull(strokeFill, nameof(strokeFill));
 
-        // Guard.MustBeGreaterThan(strokeWidth, 0, nameof(strokeWidth));
+        Guard.MustBeGreaterThan(strokeWidth, 0, nameof(strokeWidth));
         Guard.NotNull(strokePattern, nameof(strokePattern));
 
         this.StrokeFill = strokeFill;
-        this.StrokeWidth = strokeWidth > 0 ? strokeWidth : 1;
+        this.StrokeWidth = strokeWidth;
         this.pattern = strokePattern;
     }
 

src/ImageSharp.Drawing/Shapes/EllipsePolygon.cs

@@ -79,11 +79,7 @@ public override IPath Transform(Matrix3x2 matrix)
     /// <inheritdoc />
     // TODO switch this out to a calculated algorithm
     SegmentInfo IPathInternals.PointAlongPath(float distance)
-        => this.innerPath.PointAlongPath(distance);
-
-    /// <inheritdoc/>
-    IReadOnlyList<InternalPath> IInternalPathOwner.GetRingsAsInternalPath()
-        => [this.innerPath];
+        => this.InnerPath.PointAlongPath(distance);
 
     private static CubicBezierLineSegment CreateSegment(Vector2 location, SizeF size)
     {

src/ImageSharp.Drawing/Shapes/Polygon.cs

@@ -56,7 +56,7 @@ internal Polygon(Path path)
     }
 
     internal Polygon(ILineSegment[] segments, bool owned)
-        : base(owned ? segments : segments.ToArray())
+        : base(owned ? segments : [.. segments])
     {
     }
 

tests/ImageSharp.Drawing.Tests/Drawing/FillPatternBrushTests.cs

@@ -30,11 +30,7 @@ private void Test(string name, Color background, Brush brush, Color[,] expectedP
             int offsetY = r.Next(image.Height / yStride) * yStride;
             for (int x = 0; x < xStride; x++)
             {
-                int actualX = x + offsetX;
-                int actualY = y + offsetY;
-                Rgba32 expected = expectedPatternFast[y, x].ToPixel<Rgba32>(); // inverted pattern
-                Rgba32 actual = sourcePixels[actualX, actualY];
-                if (expected != actual)
+                for (int y = 0; y < yStride; y++)
                 {
                     int actualX = x + offsetX;
                     int actualY = y + offsetY;
@@ -46,10 +42,10 @@ private void Test(string name, Color background, Brush brush, Color[,] expectedP
                     }
                 }
             }
-        }
 
-        image.Mutate(x => x.Resize(80, 80, KnownResamplers.NearestNeighbor));
-        image.Save($"{path}/{name}x4.png");
+            image.Mutate(x => x.Resize(80, 80, KnownResamplers.NearestNeighbor));
+            image.Save($"{path}/{name}x4.png");
+        }
     }
 
     [Fact]