Cleanup (SixLabors#965)

SimonCropp · JimBobSquarePants · commit 636b27e3ddb1 · 2019-08-12T01:35:03.000+10:00
* redundant ()

* redundant stirng interpolation

* use method groups

* redundant unsafe

* redundant qualifiers

* redundant ()

* redundant init

* redundant init

* redundant casts

* redundant casts
diff --git a/src/ImageSharp.Drawing/Processing/Processors/Drawing/FillRegionProcessor{TPixel}.cs b/src/ImageSharp.Drawing/Processing/Processors/Drawing/FillRegionProcessor{TPixel}.cs
@@ -94,7 +94,7 @@ protected override void OnFrameApply(ImageFrame<TPixel> source, Rectangle source
                         }
 
                         float yPlusOne = y + 1;
-                        for (float subPixel = (float)y; subPixel < yPlusOne; subPixel += subpixelFraction)
+                        for (float subPixel = y; subPixel < yPlusOne; subPixel += subpixelFraction)
                         {
                             int pointsFound = region.Scan(subPixel + offset, buffer, configuration);
                             if (pointsFound == 0)
@@ -192,4 +192,4 @@ private bool IsSolidBrushWithoutBlending(out SolidBrush solidBrush)
             return this.definition.Options.IsOpaqueColorWithoutBlending(solidBrush.Color);
         }
     }
-}
+}
diff --git a/src/ImageSharp.Drawing/Processing/Processors/Text/DrawTextProcessor{TPixel}.cs b/src/ImageSharp.Drawing/Processing/Processors/Text/DrawTextProcessor{TPixel}.cs
@@ -135,21 +135,22 @@ private class CachingGlyphRenderer : IGlyphRenderer, IDisposable
 
             private readonly PathBuilder builder;
 
-            private Point currentRenderPosition = default;
-            private (GlyphRendererParameters glyph, PointF subPixelOffset) currentGlyphRenderParams = default;
-            private readonly int offset = 0;
-            private PointF currentPoint = default(PointF);
+            private Point currentRenderPosition;
+            private (GlyphRendererParameters glyph, PointF subPixelOffset) currentGlyphRenderParams;
+            private readonly int offset;
+            private PointF currentPoint;
 
             private readonly Dictionary<(GlyphRendererParameters glyph, PointF subPixelOffset), GlyphRenderData>
                 glyphData = new Dictionary<(GlyphRendererParameters glyph, PointF subPixelOffset), GlyphRenderData>();
 
-            private readonly bool renderOutline = false;
-            private readonly bool renderFill = false;
-            private bool rasterizationRequired = false;
+            private readonly bool renderOutline;
+            private readonly bool renderFill;
+            private bool rasterizationRequired;
 
             public CachingGlyphRenderer(MemoryAllocator memoryAllocator, int size, IPen pen, bool renderFill)
             {
                 this.MemoryAllocator = memoryAllocator;
+                this.currentRenderPosition = default;
                 this.Pen = pen;
                 this.renderFill = renderFill;
                 this.renderOutline = pen != null;
@@ -326,7 +327,7 @@ private Buffer2D<float> Render(IPath path)
                         bool scanlineDirty = false;
                         float yPlusOne = y + 1;
 
-                        for (float subPixel = (float)y; subPixel < yPlusOne; subPixel += subpixelFraction)
+                        for (float subPixel = y; subPixel < yPlusOne; subPixel += subpixelFraction)
                         {
                             var start = new PointF(path.Bounds.Left - 1, subPixel);
                             var end = new PointF(path.Bounds.Right + 1, subPixel);
diff --git a/tests/ImageSharp.Tests/Drawing/FillSolidBrushTests.cs b/tests/ImageSharp.Tests/Drawing/FillSolidBrushTests.cs
@@ -1,4 +1,4 @@
-﻿// Copyright (c) Six Labors and contributors.
+// Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
 using System;
@@ -111,7 +111,7 @@ public void FillRegion_WorksOnWrappedMemoryImage<TPixel>(
         }
 
         public static readonly TheoryData<bool, string, float, PixelColorBlendingMode, float> BlendData =
-            new TheoryData<bool, string, float, PixelColorBlendingMode, float>()
+            new TheoryData<bool, string, float, PixelColorBlendingMode, float>
                 {
                     { false, "Blue", 0.5f, PixelColorBlendingMode.Normal, 1.0f },
                     { false, "Blue", 1.0f, PixelColorBlendingMode.Normal, 0.5f },
@@ -196,4 +196,4 @@ public void BlendFillColorOverBackground<TPixel>(
             }
         }
     }
-}
+}
diff --git a/tests/ImageSharp.Tests/Drawing/Paths/ShapeRegionTests.cs b/tests/ImageSharp.Tests/Drawing/Paths/ShapeRegionTests.cs
@@ -1,4 +1,4 @@
-﻿// Copyright (c) Six Labors and contributors.
+// Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.Primitives;
@@ -56,7 +56,7 @@ public int FindIntersections(PointF s, PointF e, Span<PointF> buffer)
 
         public ShapeRegionTests()
         {
-            this.pathMock = new Mock<MockPath>() { CallBase = true };
+            this.pathMock = new Mock<MockPath> { CallBase = true };
 
             this.bounds = new RectangleF(10.5f, 10, 10, 10);
             this.pathMock.Setup(x => x.Bounds).Returns(this.bounds);
@@ -124,4 +124,4 @@ public void ShapeRegionFromShapeMaxIntersectionsProxyToShape()
             this.pathMock.Verify(x => x.MaxIntersections);
         }
     }
-}
+}
diff --git a/tests/ImageSharp.Tests/Drawing/Utils/QuickSortTests.cs b/tests/ImageSharp.Tests/Drawing/Utils/QuickSortTests.cs
@@ -1,4 +1,4 @@
-﻿// Copyright (c) Six Labors and contributors.
+// Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
 namespace SixLabors.ImageSharp.Tests.Drawing.Utils
@@ -12,7 +12,7 @@ namespace SixLabors.ImageSharp.Tests.Drawing.Utils
 
     public class QuickSortTests
     {
-        public static readonly TheoryData<float[]> Data = new TheoryData<float[]>()
+        public static readonly TheoryData<float[]> Data = new TheoryData<float[]>
                                                               {
                                                                   new float[]{ 3, 2, 1 },
                                                                   new float[0],
@@ -48,4 +48,4 @@ public void SortSlice()
             Assert.Equal(actual, expected);
         }
     }
-}
+}
diff --git a/tests/ImageSharp.Tests/FakeImageOperationsProvider.cs b/tests/ImageSharp.Tests/FakeImageOperationsProvider.cs
@@ -1,4 +1,4 @@
-﻿// Copyright (c) Six Labors and contributors.
+// Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
 using System.Collections.Generic;
@@ -69,7 +69,7 @@ public Size GetCurrentSize()
 
             public IImageProcessingContext ApplyProcessor(IImageProcessor processor, Rectangle rectangle)
             {
-                this.Applied.Add(new AppliedOperation()
+                this.Applied.Add(new AppliedOperation
                                      {
                                          Rectangle = rectangle,
                                          NonGenericProcessor = processor
@@ -79,7 +79,7 @@ public IImageProcessingContext ApplyProcessor(IImageProcessor processor, Rectang
 
             public IImageProcessingContext ApplyProcessor(IImageProcessor processor)
             {
-                this.Applied.Add(new AppliedOperation()
+                this.Applied.Add(new AppliedOperation
                                      {
                                          NonGenericProcessor = processor
                                      });
@@ -90,7 +90,7 @@ public struct AppliedOperation
             {
                 public Rectangle? Rectangle { get; set; }
                 public IImageProcessor<TPixel> GenericProcessor { get; set; }
-                
+
                 public IImageProcessor NonGenericProcessor { get; set; }
             }
         }
diff --git a/tests/ImageSharp.Tests/ImageOperationTests.cs b/tests/ImageSharp.Tests/ImageOperationTests.cs
@@ -30,7 +30,7 @@ public ImageOperationTests()
             Mock<IImageProcessor> processorMock = new Mock<IImageProcessor>();
             this.processorDefinition = processorMock.Object;
             
-            this.image = new Image<Rgba32>(new Configuration()
+            this.image = new Image<Rgba32>(new Configuration
             {
                 ImageOperationsProvider = this.provider
             }, 1, 1);
diff --git a/tests/ImageSharp.Tests/TestFont.cs b/tests/ImageSharp.Tests/TestFont.cs
@@ -1,4 +1,4 @@
-﻿// Copyright (c) Six Labors and contributors.
+// Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
 using System.Collections.Generic;
@@ -54,7 +54,7 @@ private static string GetFontsDirectory()
 
             AddFormatsDirectoryFromTestAssemblyPath(directories);
 
-            string directory = directories.FirstOrDefault(x => Directory.Exists(x));
+            string directory = directories.FirstOrDefault(Directory.Exists);
 
             if (directory != null)
             {

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ protected override void OnFrameApply(ImageFrame<TPixel> source, Rectangle source`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`float yPlusOne = y + 1;`
`97`		`- for (float subPixel = (float)y; subPixel < yPlusOne; subPixel += subpixelFraction)`
	`97`	`+ for (float subPixel = y; subPixel < yPlusOne; subPixel += subpixelFraction)`
`98`	`98`	`{`
`99`	`99`	`int pointsFound = region.Scan(subPixel + offset, buffer, configuration);`
`100`	`100`	`if (pointsFound == 0)`
`@@ -192,4 +192,4 @@ private bool IsSolidBrushWithoutBlending(out SolidBrush solidBrush)`
`192`	`192`	`return this.definition.Options.IsOpaqueColorWithoutBlending(solidBrush.Color);`
`193`	`193`	`}`
`194`	`194`	`}`
`195`		`-}`
	`195`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Copyright (c) Six Labors and contributors.`
	`1`	`+// Copyright (c) Six Labors and contributors.`
`2`	`2`	`// Licensed under the Apache License, Version 2.0.`
`3`	`3`
`4`	`4`	`using System;`
`@@ -111,7 +111,7 @@ public void FillRegion_WorksOnWrappedMemoryImage<TPixel>(`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`public static readonly TheoryData<bool, string, float, PixelColorBlendingMode, float> BlendData =`
`114`		`- new TheoryData<bool, string, float, PixelColorBlendingMode, float>()`
	`114`	`+ new TheoryData<bool, string, float, PixelColorBlendingMode, float>`
`115`	`115`	`{`
`116`	`116`	`{ false, "Blue", 0.5f, PixelColorBlendingMode.Normal, 1.0f },`
`117`	`117`	`{ false, "Blue", 1.0f, PixelColorBlendingMode.Normal, 0.5f },`
`@@ -196,4 +196,4 @@ public void BlendFillColorOverBackground<TPixel>(`
`196`	`196`	`}`
`197`	`197`	`}`
`198`	`198`	`}`
`199`		`-}`
	`199`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public ImageOperationTests()`
`30`	`30`	`Mock<IImageProcessor> processorMock = new Mock<IImageProcessor>();`
`31`	`31`	`this.processorDefinition = processorMock.Object;`
`32`	`32`
`33`		`- this.image = new Image<Rgba32>(new Configuration()`
	`33`	`+ this.image = new Image<Rgba32>(new Configuration`
`34`	`34`	`{`
`35`	`35`	`ImageOperationsProvider = this.provider`
`36`	`36`	`}, 1, 1);`