Revert extension return type changes

Author: JimBobSquarePants

src/ImageSharp.Drawing/Shapes/ClipPathExtensions.cs

@@ -17,7 +17,7 @@ public static class ClipPathExtensions
         /// <param name="shape">The shape.</param>
         /// <param name="holes">The holes.</param>
         /// <returns>Returns a new shape with the holes clipped out of the shape.</returns>
-        public static ComplexPolygon Clip(this IPath shape, IEnumerable<IPath> holes)
+        public static IPath Clip(this IPath shape, IEnumerable<IPath> holes)
         {
             var clipper = new Clipper();
 
@@ -35,7 +35,7 @@ public static ComplexPolygon Clip(this IPath shape, IEnumerable<IPath> holes)
         /// <param name="shape">The shape.</param>
         /// <param name="holes">The holes.</param>
         /// <returns>Returns a new shape with the holes clipped out of the shape.</returns>
-        public static ComplexPolygon Clip(this IPath shape, params IPath[] holes)
+        public static IPath Clip(this IPath shape, params IPath[] holes)
             => shape.Clip((IEnumerable<IPath>)holes);
     }
 }

src/ImageSharp.Drawing/Shapes/OutlinePathExtensions.cs

@@ -25,7 +25,7 @@ public static class OutlinePathExtensions
         /// <param name="width">The final width outline</param>
         /// <param name="pattern">The pattern made of multiples of the width.</param>
         /// <returns>A new path representing the outline.</returns>
-        public static ComplexPolygon GenerateOutline(this IPath path, float width, float[] pattern)
+        public static IPath GenerateOutline(this IPath path, float width, float[] pattern)
             => path.GenerateOutline(width, new ReadOnlySpan<float>(pattern));
 
         /// <summary>
@@ -35,7 +35,7 @@ public static ComplexPolygon GenerateOutline(this IPath path, float width, float
         /// <param name="width">The final width outline</param>
         /// <param name="pattern">The pattern made of multiples of the width.</param>
         /// <returns>A new path representing the outline.</returns>
-        public static ComplexPolygon GenerateOutline(this IPath path, float width, ReadOnlySpan<float> pattern)
+        public static IPath GenerateOutline(this IPath path, float width, ReadOnlySpan<float> pattern)
             => path.GenerateOutline(width, pattern, false);
 
         /// <summary>
@@ -46,7 +46,7 @@ public static ComplexPolygon GenerateOutline(this IPath path, float width, ReadO
         /// <param name="pattern">The pattern made of multiples of the width.</param>
         /// <param name="startOff">Weather the first item in the pattern is on or off.</param>
         /// <returns>A new path representing the outline.</returns>
-        public static ComplexPolygon GenerateOutline(this IPath path, float width, float[] pattern, bool startOff)
+        public static IPath GenerateOutline(this IPath path, float width, float[] pattern, bool startOff)
             => path.GenerateOutline(width, new ReadOnlySpan<float>(pattern), startOff);
 
         /// <summary>
@@ -57,7 +57,7 @@ public static ComplexPolygon GenerateOutline(this IPath path, float width, float
         /// <param name="pattern">The pattern made of multiples of the width.</param>
         /// <param name="startOff">Weather the first item in the pattern is on or off.</param>
         /// <returns>A new path representing the outline.</returns>
-        public static ComplexPolygon GenerateOutline(this IPath path, float width, ReadOnlySpan<float> pattern, bool startOff)
+        public static IPath GenerateOutline(this IPath path, float width, ReadOnlySpan<float> pattern, bool startOff)
             => GenerateOutline(path, width, pattern, startOff, JointStyle.Square, EndCapStyle.Butt);
 
         /// <summary>
@@ -70,7 +70,7 @@ public static ComplexPolygon GenerateOutline(this IPath path, float width, ReadO
         /// <param name="jointStyle">The style to render the joints.</param>
         /// <param name="patternSectionCapStyle">The style to render between sections of the specified pattern.</param>
         /// <returns>A new path representing the outline.</returns>
-        public static ComplexPolygon GenerateOutline(this IPath path, float width, ReadOnlySpan<float> pattern, bool startOff, JointStyle jointStyle = JointStyle.Square, EndCapStyle patternSectionCapStyle = EndCapStyle.Butt)
+        public static IPath GenerateOutline(this IPath path, float width, ReadOnlySpan<float> pattern, bool startOff, JointStyle jointStyle = JointStyle.Square, EndCapStyle patternSectionCapStyle = EndCapStyle.Butt)
         {
             if (pattern.Length < 2)
             {
@@ -177,7 +177,7 @@ public static ComplexPolygon GenerateOutline(this IPath path, float width, ReadO
         /// <param name="path">the path to outline</param>
         /// <param name="width">The final width outline</param>
         /// <returns>A new path representing the outline.</returns>
-        public static ComplexPolygon GenerateOutline(this IPath path, float width) => GenerateOutline(path, width, JointStyle.Square, EndCapStyle.Butt);
+        public static IPath GenerateOutline(this IPath path, float width) => GenerateOutline(path, width, JointStyle.Square, EndCapStyle.Butt);
 
         /// <summary>
         /// Generates a solid outline of the path.
@@ -187,7 +187,7 @@ public static ComplexPolygon GenerateOutline(this IPath path, float width, ReadO
         /// <param name="jointStyle">The style to render the joints.</param>
         /// <param name="endCapStyle">The style to render the end caps of open paths (ignored on closed paths).</param>
         /// <returns>A new path representing the outline.</returns>
-        public static ComplexPolygon GenerateOutline(this IPath path, float width, JointStyle jointStyle = JointStyle.Square, EndCapStyle endCapStyle = EndCapStyle.Square)
+        public static IPath GenerateOutline(this IPath path, float width, JointStyle jointStyle = JointStyle.Square, EndCapStyle endCapStyle = EndCapStyle.Square)
         {
             var offset = new ClipperOffset()
             {

tests/ImageSharp.Drawing.Tests/Drawing/DrawComplexPolygonTests.cs

@@ -30,7 +30,7 @@ public void DrawComplexPolygon<TPixel>(TestImageProvider<TPixel> provider, bool
                 overlap ? new Vector2(130, 40) : new Vector2(93, 85),
                 new Vector2(65, 137)));
 
-            ComplexPolygon clipped = simplePath.Clip(hole1);
+            IPath clipped = simplePath.Clip(hole1);
 
             Rgba32 colorRgba = Color.White;
             if (transparent)

tests/ImageSharp.Drawing.Tests/Drawing/DrawingRobustnessTests.cs

@@ -36,7 +36,7 @@ public void CompareToSkiaResults_StarCircle(TestImageProvider<Rgba32> provider)
         {
             var circle = new EllipsePolygon(32, 32, 30);
             var star = new Star(32, 32, 7, 10, 27);
-            ComplexPolygon shape = circle.Clip(star);
+            IPath shape = circle.Clip(star);
 
             CompareToSkiaResultsImpl(provider, shape);
         }

tests/ImageSharp.Drawing.Tests/Drawing/FillComplexPolygonTests.cs

@@ -29,7 +29,7 @@ public void ComplexPolygon_SolidFill<TPixel>(TestImageProvider<TPixel> provider,
                 overlap ? new Vector2(130, 40) : new Vector2(93, 85),
                 new Vector2(65, 137)));
 
-            ComplexPolygon clipped = simplePath.Clip(hole1);
+            IPath clipped = simplePath.Clip(hole1);
 
             Rgba32 colorRgba = Color.HotPink;
             if (transparent)

tests/ImageSharp.Drawing.Tests/Drawing/FillPolygonTests.cs

@@ -135,8 +135,8 @@ public void FillPolygon_Complex<TPixel>(TestImageProvider<TPixel> provider, bool
                 },
                 testOutputDetails: $"Reverse({reverse})_IntersectionRule({intersectionRule})",
                 comparer: ImageComparer.TolerantPercentage(0.01f),
-                appendSourceFileOrDescription: false,
-                appendPixelTypeToFileName: false);
+                appendPixelTypeToFileName: false,
+                appendSourceFileOrDescription: false);
         }
 
         [Theory]
@@ -165,8 +165,8 @@ public void FillPolygon_Concave<TPixel>(TestImageProvider<TPixel> provider, bool
                 c => c.FillPolygon(color, points),
                 testOutputDetails: $"Reverse({reverse})",
                 comparer: ImageComparer.TolerantPercentage(0.01f),
-                appendSourceFileOrDescription: false,
-                appendPixelTypeToFileName: false);
+                appendPixelTypeToFileName: false,
+                appendSourceFileOrDescription: false);
         }
 
         [Theory]
@@ -175,7 +175,7 @@ public void FillPolygon_StarCircle(TestImageProvider<Rgba32> provider)
         {
             var circle = new EllipsePolygon(32, 32, 30);
             var star = new Star(32, 32, 7, 10, 27);
-            ComplexPolygon shape = circle.Clip(star);
+            IPath shape = circle.Clip(star);
 
             provider.RunValidatingProcessorTest(
                 c => c.Fill(Color.White, shape),

tests/ImageSharp.Drawing.Tests/Shapes/Issues/Issue_ClippedPaths.cs

@@ -20,8 +20,8 @@ public void ClippedTriangle()
                             new PointF(93, 85),
                             new PointF(65, 137)));
 
-            ComplexPolygon clippedPath = simplePath.Clip(hole1);
-            ComplexPolygon outline = clippedPath.GenerateOutline(5, new[] { 1f });
+            IPath clippedPath = simplePath.Clip(hole1);
+            IPath outline = clippedPath.GenerateOutline(5, new[] { 1f });
 
             Assert.False(outline.Contains(new PointF(74, 97)));
         }

tests/ImageSharp.Drawing.Tests/Shapes/Scan/ScanEdgeCollectionTests.cs

@@ -111,7 +111,7 @@ public void ComplexPolygon()
             Polygon hole = PolygonFactory.CreatePolygon(
                 (2, 2), (2, 3), (3, 3), (3, 4), (4, 4), (4, 3), (3, 2));
 
-            ComplexPolygon polygon = contour.Clip(hole);
+            IPath polygon = contour.Clip(hole);
             DebugDraw.Polygon(polygon, 1, 100);
 
             this.edges = ScanEdgeCollection.Create(polygon, MemoryAllocator, 16);