Merge pull request #288 from SixLabors/js/conditions

Remove compiler conditions

Author: JimBobSquarePants

src/ImageSharp.Drawing/Shapes/Path.cs

@@ -419,16 +419,6 @@ private static ReadOnlySpan<char> TrimSeparator(ReadOnlySpan<char> data)
         return data.Slice(idx);
     }
 
-#if !NETCOREAPP2_1_OR_GREATER
-    private static unsafe float ParseFloat(ReadOnlySpan<char> str)
-    {
-        fixed (char* p = str)
-        {
-            return float.Parse(new string(p, 0, str.Length));
-        }
-    }
-#else
     private static float ParseFloat(ReadOnlySpan<char> str)
         => float.Parse(str, provider: CultureInfo.InvariantCulture);
-#endif
 }

src/ImageSharp.Drawing/Shapes/PolygonClipper/Clipper.cs

@@ -44,12 +44,7 @@ public IPath[] GenerateClippedShapes(ClippingOperation operation, IntersectionRu
 
             for (int j = 0; j < path.Count; j++)
             {
-#if NET472
-                Vector2 v = path[j];
-                points[j] = new PointF((float)(v.X / (double)ScalingFactor), (float)(v.Y / (double)ScalingFactor));
-#else
                 points[j] = path[j] / ScalingFactor;
-#endif
             }
 
             shapes[index++] = new Polygon(points);
@@ -62,12 +57,7 @@ public IPath[] GenerateClippedShapes(ClippingOperation operation, IntersectionRu
 
             for (int j = 0; j < path.Count; j++)
             {
-#if NET472
-                Vector2 v = path[j];
-                points[j] = new PointF((float)(v.X / (double)ScalingFactor), (float)(v.Y / (double)ScalingFactor));
-#else
                 points[j] = path[j] / ScalingFactor;
-#endif
             }
 
             shapes[index++] = new Polygon(points);

src/ImageSharp.Drawing/Shapes/PolygonClipper/ClipperOffset.cs

@@ -39,12 +39,7 @@ public ComplexPolygon Execute(float width)
             var points = new PointF[pt.Count];
             for (int j = 0; j < pt.Count; j++)
             {
-#if NET472
-                Vector2 v = pt[j];
-                points[j] = new PointF((float)(v.X / (double)ScalingFactor), (float)(v.Y / (double)ScalingFactor));
-#else
                 points[j] = pt[j] / ScalingFactor;
-#endif
             }
 
             polygons[i] = new Polygon(points);

src/ImageSharp.Drawing/Shapes/PolygonClipper/PolygonOffsetter.cs

@@ -77,7 +77,7 @@ public void Execute(float delta, PathsF solution)
         this.ExecuteInternal(delta);
         if (this.groupList.Count == 0)
         {
-            goto Error;
+            return;
         }
 
         // Clean up self-intersections.
@@ -99,8 +99,6 @@ public void Execute(float delta, PathsF solution)
             clipper.Execute(ClippingOperation.Union, FillRule.Positive, solution);
         }
 
-        Error:
-
         // PolygonClipper will throw for unhandled exceptions but we need to explicitly capture an empty result.
         if (solution.Count == 0)
         {

src/ImageSharp.Drawing/Shapes/Rasterization/ActiveEdgeList.cs

@@ -2,7 +2,6 @@
 // Licensed under the Six Labors Split License.
 
 using System.Runtime.CompilerServices;
-using SixLabors.ImageSharp.Drawing.Utilities;
 
 namespace SixLabors.ImageSharp.Drawing.Shapes.Rasterization;
 
@@ -36,7 +35,7 @@ public ActiveEdgeList(Span<int> buffer)
         this.Buffer = buffer;
     }
 
-    private Span<int> ActiveEdges => this.Buffer.Slice(0, this.count);
+    private readonly Span<int> ActiveEdges => this.Buffer.Slice(0, this.count);
 
     public void EnterEdge(int edgeIdx) => this.Buffer[this.count++] = edgeIdx | EnteringEdgeFlag;
 
@@ -120,7 +119,8 @@ public Span<float> ScanOddEven(float y, Span<ScanEdge> edges, Span<float> inters
         this.count -= offset;
 
         intersections = intersections.Slice(0, intersectionCounter);
-        SortUtility.Sort(intersections);
+        intersections.Sort();
+
         return intersections;
     }
 
@@ -180,7 +180,7 @@ public Span<float> ScanNonZero(
 
         intersections = intersections.Slice(0, intersectionCounter);
         intersectionTypes = intersectionTypes.Slice(0, intersectionCounter);
-        SortUtility.Sort(intersections, intersectionTypes);
+        intersections.Sort(intersectionTypes);
 
         return ApplyNonzeroRule(intersections, intersectionTypes);
     }

src/ImageSharp.Drawing/Shapes/Rasterization/PolygonScanner.cs

@@ -3,7 +3,6 @@
 
 using System.Buffers;
 using System.Runtime.InteropServices;
-using SixLabors.ImageSharp.Drawing.Utilities;
 using SixLabors.ImageSharp.Memory;
 
 namespace SixLabors.ImageSharp.Drawing.Shapes.Rasterization;
@@ -120,8 +119,8 @@ private void Init()
             this.sorted1[i] = i;
         }
 
-        SortUtility.Sort(keys0, this.sorted0);
-        SortUtility.Sort(keys1, this.sorted1);
+        keys0.Sort(this.sorted0);
+        keys1.Sort(this.sorted1);
 
         this.SkipEdgesBeforeMinY();
     }
@@ -195,7 +194,7 @@ public ReadOnlySpan<float> ScanCurrentLine()
         ? this.activeEdges.ScanOddEven(this.SubPixelY, this.edges, this.intersections)
         : this.activeEdges.ScanNonZero(this.SubPixelY, this.edges, this.intersections, this.intersectionTypes);
 
-    public void Dispose()
+    public readonly void Dispose()
     {
         this.edgeCollection.Dispose();
         this.dataBuffer.Dispose();

src/ImageSharp.Drawing/Utilities/NumericUtilities.cs

@@ -38,50 +38,6 @@ public static void AddToAllElements(this Span<float> span, float value)
         }
     }
 
-    // https://apisof.net/catalog/System.Numerics.BitOperations.Log2(UInt32)
-    // BitOperations.Log2() has been introduced in .NET Core 3.0,
-    // since we do target only 3.1+, we can detect it's presence by using SUPPORTS_RUNTIME_INTRINSICS
-    // TODO: Ideally this should have a separate definition in Build.props, but that adaption should be done cross-repo. Using a workaround until then.
-#if SUPPORTS_RUNTIME_INTRINSICS
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public static int Log2(uint value) => BitOperations.Log2(value);
-
-#else
-
-#pragma warning disable SA1515, SA1414, SA1114, SA1201
-    private static ReadOnlySpan<byte> Log2DeBruijn => new byte[32]
-    {
-        00, 09, 01, 10, 13, 21, 02, 29,
-        11, 14, 16, 18, 22, 25, 03, 30,
-        08, 12, 20, 28, 15, 17, 24, 07,
-        19, 27, 23, 06, 26, 05, 04, 31
-    };
-
-    // Adapted from:
-    // https://github.com/dotnet/runtime/blob/5c65d891f203618245184fa54397ced0a8ca806c/src/libraries/System.Private.CoreLib/src/System/Numerics/BitOperations.cs#L205-L223
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public static int Log2(uint value)
-    {
-        // No AggressiveInlining due to large method size
-        // Has conventional contract 0->0 (Log(0) is undefined)
-
-        // Fill trailing zeros with ones, eg 00010010 becomes 00011111
-        value |= value >> 01;
-        value |= value >> 02;
-        value |= value >> 04;
-        value |= value >> 08;
-        value |= value >> 16;
-
-        // uint.MaxValue >> 27 is always in range [0 - 31] so we use Unsafe.AddByteOffset to avoid bounds check
-        return Unsafe.AddByteOffset(
-            // Using deBruijn sequence, k=2, n=5 (2^5=32) : 0b_0000_0111_1100_0100_1010_1100_1101_1101u
-            ref MemoryMarshal.GetReference(Log2DeBruijn),
-            // uint|long -> IntPtr cast on 32-bit platforms does expensive overflow checks not needed here
-            (IntPtr)(int)((value * 0x07C4ACDDu) >> 27));
-    }
-
-#pragma warning restore
-#endif
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static float ClampFloat(float value, float min, float max)
     {