Cleanup

Author: JimBobSquarePants

src/ImageSharp.Drawing/Shapes/Path.cs

@@ -3,10 +3,8 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Numerics;
-using System.Runtime.CompilerServices;
 
 namespace SixLabors.ImageSharp.Drawing
 {
@@ -161,15 +159,15 @@ public static bool TryParseSvgPath(ReadOnlySpan<char> data, out IPath value)
                 char ch = data[0];
                 if (char.IsDigit(ch) || ch == '-' || ch == '+' || ch == '.')
                 {
-                    // are we are the end of the string or we are at the end of the path
+                    // Are we are the end of the string or we are at the end of the path?
                     if (data.Length == 0 || op == 'Z')
                     {
                         return false;
                     }
                 }
-                else if (IsSeperator(ch))
+                else if (IsSeparator(ch))
                 {
-                    data = TrimSeperator(data);
+                    data = TrimSeparator(data);
                 }
                 else
                 {
@@ -181,7 +179,7 @@ public static bool TryParseSvgPath(ReadOnlySpan<char> data, out IPath value)
                         relative = true;
                     }
 
-                    data = TrimSeperator(data.Slice(1));
+                    data = TrimSeparator(data.Slice(1));
                 }
 
                 switch (op)
@@ -262,16 +260,16 @@ public static bool TryParseSvgPath(ReadOnlySpan<char> data, out IPath value)
                         break;
                     case 'A':
                         data = FindScaler(data, out float radiiX);
-                        data = TrimSeperator(data);
+                        data = TrimSeparator(data);
                         data = FindScaler(data, out float radiiY);
-                        data = TrimSeperator(data);
+                        data = TrimSeparator(data);
                         data = FindScaler(data, out float angle);
-                        data = TrimSeperator(data);
+                        data = TrimSeparator(data);
                         data = FindScaler(data, out float largeArc);
-                        data = TrimSeperator(data);
+                        data = TrimSeparator(data);
                         data = FindScaler(data, out float sweep);
 
-                        data = FindPoint(data, out var point, relative, c);
+                        data = FindPoint(data, out PointF point, relative, c);
                         if (data.Length > 0)
                         {
                             builder.ArcTo(radiiX, radiiY, angle, largeArc == 1, sweep == 1, point);
@@ -304,10 +302,10 @@ public static bool TryParseSvgPath(ReadOnlySpan<char> data, out IPath value)
             value = builder.Build();
             return true;
 
-            static bool IsSeperator(char ch)
+            static bool IsSeparator(char ch)
                 => char.IsWhiteSpace(ch) || ch == ',';
 
-            static ReadOnlySpan<char> TrimSeperator(ReadOnlySpan<char> data)
+            static ReadOnlySpan<char> TrimSeparator(ReadOnlySpan<char> data)
             {
                 if (data.Length == 0)
                 {
@@ -317,7 +315,7 @@ static ReadOnlySpan<char> TrimSeperator(ReadOnlySpan<char> data)
                 int idx = 0;
                 for (; idx < data.Length; idx++)
                 {
-                    if (!IsSeperator(data[idx]))
+                    if (!IsSeparator(data[idx]))
                     {
                         break;
                     }
@@ -326,7 +324,7 @@ static ReadOnlySpan<char> TrimSeperator(ReadOnlySpan<char> data)
                 return data.Slice(idx);
             }
 
-            static ReadOnlySpan<char> FindPoint(ReadOnlySpan<char> str, out PointF value, bool isRelative, in PointF relative)
+            static ReadOnlySpan<char> FindPoint(ReadOnlySpan<char> str, out PointF value, bool isRelative, PointF relative)
             {
                 str = FindScaler(str, out float x);
                 str = FindScaler(str, out float y);
@@ -342,16 +340,15 @@ static ReadOnlySpan<char> FindPoint(ReadOnlySpan<char> str, out PointF value, bo
 
             static ReadOnlySpan<char> FindScaler(ReadOnlySpan<char> str, out float scaler)
             {
-                str = TrimSeperator(str);
+                str = TrimSeparator(str);
                 scaler = 0;
 
-                for (var i = 0; i < str.Length; i++)
+                for (int i = 0; i < str.Length; i++)
                 {
-                    if (IsSeperator(str[i]) || i == str.Length)
+                    if (IsSeparator(str[i]) || i == str.Length)
                     {
                         scaler = ParseFloat(str.Slice(0, i));
-                        str = str.Slice(i);
-                        return str;
+                        return str.Slice(i);
                     }
                 }
 
@@ -360,8 +357,7 @@ static ReadOnlySpan<char> FindScaler(ReadOnlySpan<char> str, out float scaler)
                     scaler = ParseFloat(str);
                 }
 
-                str = ReadOnlySpan<char>.Empty;
-                return str;
+                return ReadOnlySpan<char>.Empty;
             }
 
 #if !NETCOREAPP2_1_OR_GREATER

tests/ImageSharp.Drawing.Tests/Drawing/FillPathTests.cs

@@ -23,31 +23,31 @@ public void FillPathSVGArcs<TPixel>(TestImageProvider<TPixel> provider)
             pb.MoveTo(new Vector2(80, 80))
               .ArcTo(45, 45, 0, false, false, new Vector2(125, 125))
               .LineTo(new Vector2(125, 80))
-              .LineTo(new Vector2(80, 80));
+              .CloseFigure();
 
             IPath path = pb.Build();
 
             pb = new PathBuilder();
             pb.MoveTo(new Vector2(230, 80))
               .ArcTo(45, 45, 0, true, false, new Vector2(275, 125))
               .LineTo(new Vector2(275, 80))
-              .LineTo(new Vector2(230, 80));
+              .CloseFigure();
 
             IPath path2 = pb.Build();
 
             pb = new PathBuilder();
             pb.MoveTo(new Vector2(80, 230))
               .ArcTo(45, 45, 0, false, true, new Vector2(125, 275))
               .LineTo(new Vector2(125, 230))
-              .LineTo(new Vector2(80, 230));
+              .CloseFigure();
 
             IPath path3 = pb.Build();
 
             pb = new PathBuilder();
             pb.MoveTo(new Vector2(230, 230))
               .ArcTo(45, 45, 0, true, true, new Vector2(275, 275))
               .LineTo(new Vector2(275, 230))
-              .LineTo(new Vector2(230, 230));
+              .CloseFigure();
 
             IPath path4 = pb.Build();