Fix remaining nullability warnings

Author: JimBobSquarePants

src/ImageSharp.Drawing/Processing/DrawingOptionsDefaultsExtensions.cs

@@ -1,8 +1,6 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-#nullable disable
-
 using System.Numerics;
 
 namespace SixLabors.ImageSharp.Drawing.Processing;
@@ -49,7 +47,7 @@ public static void SetDrawingTransform(this Configuration configuration, Matrix3
     /// <returns>The matrix.</returns>
     public static Matrix3x2 GetDrawingTransform(this IImageProcessingContext context)
     {
-        if (context.Properties.TryGetValue(DrawingTransformMatrixKey, out object options) && options is Matrix3x2 go)
+        if (context.Properties.TryGetValue(DrawingTransformMatrixKey, out object? options) && options is Matrix3x2 go)
         {
             return go;
         }
@@ -66,7 +64,7 @@ public static Matrix3x2 GetDrawingTransform(this IImageProcessingContext context
     /// <returns>The globally configured default matrix.</returns>
     public static Matrix3x2 GetDrawingTransform(this Configuration configuration)
     {
-        if (configuration.Properties.TryGetValue(DrawingTransformMatrixKey, out object options) && options is Matrix3x2 go)
+        if (configuration.Properties.TryGetValue(DrawingTransformMatrixKey, out object? options) && options is Matrix3x2 go)
         {
             return go;
         }

src/ImageSharp.Drawing/Processing/Processors/Drawing/FillPathProcessor{TPixel}.cs

@@ -1,9 +1,8 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-#nullable disable
-
 using System.Buffers;
+using System.Diagnostics.CodeAnalysis;
 using SixLabors.ImageSharp.Drawing.Shapes.Rasterization;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.Processing.Processors;
@@ -47,11 +46,17 @@ protected override void OnFrameApply(ImageFrame<TPixel> source)
         ShapeOptions shapeOptions = this.definition.Options.ShapeOptions;
         GraphicsOptions graphicsOptions = this.definition.Options.GraphicsOptions;
         Brush brush = this.definition.Brush;
-        bool isSolidBrushWithoutBlending = IsSolidBrushWithoutBlending(graphicsOptions, brush, out SolidBrush solidBrush);
-        TPixel solidBrushColor = isSolidBrushWithoutBlending ? solidBrush.Color.ToPixel<TPixel>() : default;
+
+        TPixel solidBrushColor = default;
+        bool isSolidBrushWithoutBlending = false;
+        if (IsSolidBrushWithoutBlending(graphicsOptions, brush, out SolidBrush? solidBrush))
+        {
+            isSolidBrushWithoutBlending = true;
+            solidBrushColor = solidBrush.Color.ToPixel<TPixel>();
+        }
 
         // Align start/end positions.
-        var interest = Rectangle.Intersect(this.bounds, source.Bounds());
+        Rectangle interest = Rectangle.Intersect(this.bounds, source.Bounds());
         if (interest.Equals(Rectangle.Empty))
         {
             return; // No effect inside image;
@@ -74,7 +79,7 @@ protected override void OnFrameApply(ImageFrame<TPixel> source)
         MemoryAllocator allocator = this.Configuration.MemoryAllocator;
         bool scanlineDirty = true;
 
-        var scanner = PolygonScanner.Create(
+        PolygonScanner scanner = PolygonScanner.Create(
             this.path,
             interest.Top,
             interest.Bottom,
@@ -138,7 +143,7 @@ protected override void OnFrameApply(ImageFrame<TPixel> source)
         }
     }
 
-    private static bool IsSolidBrushWithoutBlending(GraphicsOptions options, Brush inputBrush, out SolidBrush solidBrush)
+    private static bool IsSolidBrushWithoutBlending(GraphicsOptions options, Brush inputBrush, [NotNullWhen(true)] out SolidBrush? solidBrush)
     {
         solidBrush = inputBrush as SolidBrush;
 

src/ImageSharp.Drawing/Processing/Processors/Drawing/FillProcessor{TPixel}.cs

@@ -1,9 +1,8 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-#nullable disable
-
 using System.Buffers;
+using System.Diagnostics.CodeAnalysis;
 using System.Runtime.CompilerServices;
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.Memory;
@@ -27,7 +26,7 @@ public FillProcessor(Configuration configuration, FillProcessor definition, Imag
     /// <inheritdoc/>
     protected override void OnFrameApply(ImageFrame<TPixel> source)
     {
-        var interest = Rectangle.Intersect(this.SourceRectangle, source.Bounds());
+        Rectangle interest = Rectangle.Intersect(this.SourceRectangle, source.Bounds());
         if (interest.Width == 0 || interest.Height == 0)
         {
             return;
@@ -38,14 +37,14 @@ protected override void OnFrameApply(ImageFrame<TPixel> source)
         GraphicsOptions options = this.definition.Options.GraphicsOptions;
 
         // If there's no reason for blending, then avoid it.
-        if (this.IsSolidBrushWithoutBlending(out SolidBrush solidBrush))
+        if (this.IsSolidBrushWithoutBlending(out SolidBrush? solidBrush))
         {
             ParallelExecutionSettings parallelSettings = ParallelExecutionSettings.FromConfiguration(configuration)
                 .MultiplyMinimumPixelsPerTask(4);
 
             TPixel colorPixel = solidBrush.Color.ToPixel<TPixel>();
 
-            var solidOperation = new SolidBrushRowIntervalOperation(interest, source, colorPixel);
+            FillProcessor<TPixel>.SolidBrushRowIntervalOperation solidOperation = new(interest, source, colorPixel);
             ParallelRowIterator.IterateRowIntervals(
                 interest,
                 parallelSettings,
@@ -63,14 +62,14 @@ protected override void OnFrameApply(ImageFrame<TPixel> source)
 
         amount.Memory.Span.Fill(1F);
 
-        var operation = new RowIntervalOperation(interest, applicator, amount.Memory);
+        FillProcessor<TPixel>.RowIntervalOperation operation = new(interest, applicator, amount.Memory);
         ParallelRowIterator.IterateRowIntervals(
             configuration,
             interest,
             in operation);
     }
 
-    private bool IsSolidBrushWithoutBlending(out SolidBrush solidBrush)
+    private bool IsSolidBrushWithoutBlending([NotNullWhen(true)] out SolidBrush? solidBrush)
     {
         solidBrush = this.definition.Brush as SolidBrush;
 

src/ImageSharp.Drawing/Processing/Processors/Text/DrawTextProcessor{TPixel}.cs

@@ -105,7 +105,8 @@ void Draw(IEnumerable<DrawingOperation> operations)
             }
         }
 
-        if (this.textRenderer.DrawingOperations.Count > 0)
+        // Not null, initialized in earlier event.
+        if (this.textRenderer!.DrawingOperations.Count > 0)
         {
             Draw(this.textRenderer.DrawingOperations.OrderBy(x => x.RenderPass));
         }

src/ImageSharp.Drawing/Processing/Processors/Text/RichTextGlyphRenderer.cs

@@ -62,7 +62,7 @@ public RichTextGlyphRenderer(
         this.defaultBrush = brush;
         this.DrawingOperations = new List<DrawingOperation>();
 
-        IPath path = textOptions.Path;
+        IPath? path = textOptions.Path;
         if (path is not null)
         {
             // Turn of caching. The chances of a hit are near-zero.

src/ImageSharp.Drawing/Processing/RichTextOptions.cs

@@ -1,8 +1,6 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-#nullable disable
-
 using SixLabors.Fonts;
 
 namespace SixLabors.ImageSharp.Drawing.Processing;
@@ -46,5 +44,5 @@ public RichTextOptions(RichTextOptions options)
     /// When this property is not <see langword="null"/> the <see cref="TextOptions.Origin"/>
     /// property is automatically applied as a translation to a copy of the path for processing.
     /// </remarks>
-    public IPath Path { get; set; }
+    public IPath? Path { get; set; }
 }

src/ImageSharp.Drawing/Processing/RichTextRun.cs

@@ -1,8 +1,6 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-#nullable disable
-
 using SixLabors.Fonts;
 
 namespace SixLabors.ImageSharp.Drawing.Processing;
@@ -15,25 +13,25 @@ public class RichTextRun : TextRun
     /// <summary>
     /// Gets or sets the brush used for filling this run.
     /// </summary>
-    public Brush Brush { get; set; }
+    public Brush? Brush { get; set; }
 
     /// <summary>
     /// Gets or sets the pen used for outlining this run.
     /// </summary>
-    public Pen Pen { get; set; }
+    public Pen? Pen { get; set; }
 
     /// <summary>
     /// Gets or sets the pen used for drawing strikeout features for this run.
     /// </summary>
-    public Pen StrikeoutPen { get; set; }
+    public Pen? StrikeoutPen { get; set; }
 
     /// <summary>
     /// Gets or sets the pen used for drawing underline features for this run.
     /// </summary>
-    public Pen UnderlinePen { get; set; }
+    public Pen? UnderlinePen { get; set; }
 
     /// <summary>
     /// Gets or sets the pen used for drawing overline features for this run.
     /// </summary>
-    public Pen OverlinePen { get; set; }
+    public Pen? OverlinePen { get; set; }
 }

src/ImageSharp.Drawing/Processing/ShapeGraphicOptionsDefaultsExtensions.cs

@@ -1,8 +1,6 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-#nullable disable
-
 namespace SixLabors.ImageSharp.Drawing.Processing;
 
 /// <summary>
@@ -63,16 +61,14 @@ public static void SetShapeOptions(this Configuration configuration, ShapeOption
     /// <returns>The globally configured default options.</returns>
     public static ShapeOptions GetShapeOptions(this IImageProcessingContext context)
     {
-        if (context.Properties.TryGetValue(typeof(ShapeOptions), out object options) && options is ShapeOptions go)
+        if (context.Properties.TryGetValue(typeof(ShapeOptions), out object? options) && options is ShapeOptions go)
         {
             return go;
         }
 
-        ShapeOptions configOptions = context.Configuration.GetShapeOptions();
-
         // do not cache the fall back to config into the the processing context
         // in case someone want to change the value on the config and expects it reflow thru
-        return configOptions;
+        return context.Configuration.GetShapeOptions();
     }
 
     /// <summary>
@@ -82,12 +78,12 @@ public static ShapeOptions GetShapeOptions(this IImageProcessingContext context)
     /// <returns>The globally configured default options.</returns>
     public static ShapeOptions GetShapeOptions(this Configuration configuration)
     {
-        if (configuration.Properties.TryGetValue(typeof(ShapeOptions), out object options) && options is ShapeOptions go)
+        if (configuration.Properties.TryGetValue(typeof(ShapeOptions), out object? options) && options is ShapeOptions go)
         {
             return go;
         }
 
-        var configOptions = new ShapeOptions();
+        ShapeOptions configOptions = new();
 
         // capture the fallback so the same instance will always be returned in case its mutated
         configuration.Properties[typeof(ShapeOptions)] = configOptions;

src/ImageSharp.Drawing/Shapes/ComplexPolygon.cs

@@ -1,10 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-#nullable disable
-
 using System.Buffers;
-using System.Diagnostics.CodeAnalysis;
 using System.Numerics;
 
 namespace SixLabors.ImageSharp.Drawing;
@@ -35,7 +32,7 @@ public ComplexPolygon(PointF[] contour, PointF[] hole)
     /// </summary>
     /// <param name="paths">The paths.</param>
     public ComplexPolygon(IEnumerable<IPath> paths)
-        : this(paths?.ToArray())
+        : this(paths.ToArray())
     {
     }
 
@@ -82,7 +79,7 @@ public ComplexPolygon(params IPath[] paths)
 
                 foreach (ISimplePath s in p.Flatten())
                 {
-                    var ip = new InternalPath(s.Points, s.IsClosed);
+                    InternalPath ip = new(s.Points, s.IsClosed);
                     length += ip.Length;
                     this.internalPaths.Add(ip);
                 }
@@ -120,7 +117,7 @@ public IPath Transform(Matrix3x2 matrix)
             return this;
         }
 
-        var shapes = new IPath[this.paths.Length];
+        IPath[] shapes = new IPath[this.paths.Length];
         int i = 0;
         foreach (IPath s in this.Paths)
         {
@@ -133,7 +130,7 @@ public IPath Transform(Matrix3x2 matrix)
     /// <inheritdoc />
     public IEnumerable<ISimplePath> Flatten()
     {
-        var paths = new List<ISimplePath>();
+        List<ISimplePath> paths = new();
         foreach (IPath path in this.Paths)
         {
             paths.AddRange(path.Flatten());
@@ -150,7 +147,7 @@ public IPath AsClosedPath()
             return this;
         }
 
-        var paths = new IPath[this.paths.Length];
+        IPath[] paths = new IPath[this.paths.Length];
         for (int i = 0; i < this.paths.Length; i++)
         {
             paths[i] = this.paths[i].AsClosedPath();
@@ -182,6 +179,5 @@ SegmentInfo IPathInternals.PointAlongPath(float distance)
     IReadOnlyList<InternalPath> IInternalPathOwner.GetRingsAsInternalPath()
         => this.internalPaths;
 
-    [DoesNotReturn]
     private static InvalidOperationException ThrowOutOfRange() => new("Should not be possible to reach this line");
 }