Merge pull request #2338 from stefannikolei/stefannikolei/nullable/processing

Remove nullable disable from Processing.Processors

Author: JimBobSquarePants

src/ImageSharp/Formats/Gif/GifEncoderCore.cs

@@ -171,7 +171,10 @@ private void EncodeFrames<TPixel>(
             quantized = null;
         }
 
-        paletteQuantizer.Dispose();
+        if (hasPaletteQuantizer)
+        {
+            paletteQuantizer.Dispose();
+        }
     }
 
     private void EncodeFrame<TPixel>(

src/ImageSharp/Processing/DefaultImageProcessorContext{TPixel}.cs

@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using System.Collections.Concurrent;
 using SixLabors.ImageSharp.PixelFormats;
@@ -17,7 +16,7 @@ internal class DefaultImageProcessorContext<TPixel> : IInternalImageProcessingCo
 {
     private readonly bool mutate;
     private readonly Image<TPixel> source;
-    private Image<TPixel> destination;
+    private Image<TPixel>? destination;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="DefaultImageProcessorContext{TPixel}"/> class.
@@ -54,7 +53,7 @@ public Image<TPixel> GetResultImage()
             this.destination = this.source.Clone();
         }
 
-        return this.destination;
+        return this.destination!;
     }
 
     /// <inheritdoc/>
@@ -87,7 +86,7 @@ public IImageProcessingContext ApplyProcessor(IImageProcessor processor, Rectang
         }
 
         // Standard processing pipeline.
-        using (IImageProcessor<TPixel> specificProcessor = processor.CreatePixelSpecificProcessor(this.Configuration, this.destination, rectangle))
+        using (IImageProcessor<TPixel> specificProcessor = processor.CreatePixelSpecificProcessor(this.Configuration, this.destination!, rectangle))
         {
             specificProcessor.Execute();
         }

src/ImageSharp/Processing/Processors/Convolution/KernelSamplingMap.cs

@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using System.Buffers;
 using System.Runtime.CompilerServices;
@@ -16,8 +15,8 @@ internal sealed class KernelSamplingMap : IDisposable
 {
     private readonly MemoryAllocator allocator;
     private bool isDisposed;
-    private IMemoryOwner<int> yOffsets;
-    private IMemoryOwner<int> xOffsets;
+    private IMemoryOwner<int>? yOffsets;
+    private IMemoryOwner<int>? xOffsets;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="KernelSamplingMap"/> class.
@@ -65,10 +64,10 @@ public void BuildSamplingOffsetMap(int kernelHeight, int kernelWidth, Rectangle
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public Span<int> GetRowOffsetSpan() => this.yOffsets.GetSpan();
+    public Span<int> GetRowOffsetSpan() => this.yOffsets!.GetSpan();
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public Span<int> GetColumnOffsetSpan() => this.xOffsets.GetSpan();
+    public Span<int> GetColumnOffsetSpan() => this.xOffsets!.GetSpan();
 
     /// <inheritdoc/>
     public void Dispose()

src/ImageSharp/Processing/Processors/Drawing/DrawImageProcessor.cs

@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.PixelFormats;
@@ -65,7 +64,7 @@ public IImageProcessor<TPixelBg> CreatePixelSpecificProcessor<TPixelBg>(Configur
     {
         ProcessorFactoryVisitor<TPixelBg> visitor = new(configuration, this, source, sourceRectangle);
         this.Image.AcceptVisitor(visitor);
-        return visitor.Result;
+        return visitor.Result!;
     }
 
     private class ProcessorFactoryVisitor<TPixelBg> : IImageVisitor
@@ -84,7 +83,7 @@ public ProcessorFactoryVisitor(Configuration configuration, DrawImageProcessor d
             this.sourceRectangle = sourceRectangle;
         }
 
-        public IImageProcessor<TPixelBg> Result { get; private set; }
+        public IImageProcessor<TPixelBg>? Result { get; private set; }
 
         public void Visit<TPixelFg>(Image<TPixelFg> image)
             where TPixelFg : unmanaged, IPixel<TPixelFg>

src/ImageSharp/Processing/Processors/Quantization/OctreeQuantizer{TPixel}.cs

@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using System.Buffers;
 using System.Diagnostics.CodeAnalysis;
@@ -29,7 +28,7 @@ public struct OctreeQuantizer<TPixel> : IQuantizer<TPixel>
     private readonly Octree octree;
     private IMemoryOwner<TPixel> paletteOwner;
     private ReadOnlyMemory<TPixel> palette;
-    private EuclideanPixelMap<TPixel> pixelMap;
+    private EuclideanPixelMap<TPixel>? pixelMap;
     private readonly bool isDithering;
     private bool isDisposed;
 
@@ -143,7 +142,7 @@ public readonly byte GetQuantizedColor(TPixel color, out TPixel match)
         // pixel and a black one.
         if (this.isDithering || color.Equals(default))
         {
-            return (byte)this.pixelMap.GetClosestColor(color, out match);
+            return (byte)this.pixelMap!.GetClosestColor(color, out match);
         }
 
         ref TPixel paletteRef = ref MemoryMarshal.GetReference(this.palette.Span);
@@ -158,8 +157,7 @@ public void Dispose()
         if (!this.isDisposed)
         {
             this.isDisposed = true;
-            this.paletteOwner?.Dispose();
-            this.paletteOwner = null;
+            this.paletteOwner.Dispose();
             this.pixelMap?.Dispose();
             this.pixelMap = null;
         }
@@ -183,7 +181,7 @@ private sealed class Octree
         /// <summary>
         /// Store the last node quantized
         /// </summary>
-        private OctreeNode previousNode;
+        private OctreeNode? previousNode;
 
         /// <summary>
         /// Cache the previous color quantized
@@ -221,7 +219,7 @@ public int Leaves
         /// <summary>
         /// Gets the array of reducible nodes
         /// </summary>
-        private OctreeNode[] ReducibleNodes
+        private OctreeNode?[] ReducibleNodes
         {
             [MethodImpl(InliningOptions.ShortMethod)]
             get;
@@ -311,7 +309,7 @@ private void Reduce()
             }
 
             // Reduce the node most recently added to the list at level 'index'
-            OctreeNode node = this.ReducibleNodes[index];
+            OctreeNode node = this.ReducibleNodes[index]!;
             this.ReducibleNodes[index] = node.NextReducible;
 
             // Decrement the leaf count after reducing the node
@@ -330,7 +328,7 @@ public sealed class OctreeNode
             /// <summary>
             /// Pointers to any child nodes
             /// </summary>
-            private readonly OctreeNode[] children;
+            private readonly OctreeNode?[]? children;
 
             /// <summary>
             /// Flag indicating that this is a leaf node
@@ -395,7 +393,7 @@ public OctreeNode(int level, int colorBits, Octree octree)
             /// <summary>
             /// Gets the next reducible node
             /// </summary>
-            public OctreeNode NextReducible
+            public OctreeNode? NextReducible
             {
                 [MethodImpl(InliningOptions.ShortMethod)]
                 get;
@@ -423,7 +421,7 @@ public void AddColor(ref Rgba32 color, int colorBits, int level, Octree octree)
                     // Go to the next level down in the tree
                     int index = GetColorIndex(ref color, level);
 
-                    OctreeNode child = this.children[index];
+                    OctreeNode? child = this.children![index];
                     if (child is null)
                     {
                         // Create a new child node and store it in the array
@@ -448,7 +446,7 @@ public int Reduce()
                 // Loop through all children and add their information to this node
                 for (int index = 0; index < 8; index++)
                 {
-                    OctreeNode child = this.children[index];
+                    OctreeNode? child = this.children![index];
                     if (child != null)
                     {
                         this.red += child.red;
@@ -495,7 +493,7 @@ public void ConstructPalette(Span<TPixel> palette, ref int index)
                     // Loop through children looking for leaves
                     for (int i = 0; i < 8; i++)
                     {
-                        this.children[i]?.ConstructPalette(palette, ref index);
+                        this.children![i]?.ConstructPalette(palette, ref index);
                     }
                 }
             }
@@ -517,7 +515,7 @@ public int GetPaletteIndex(ref Rgba32 pixel, int level)
                 }
 
                 int colorIndex = GetColorIndex(ref pixel, level);
-                OctreeNode child = this.children[colorIndex];
+                OctreeNode? child = this.children![colorIndex];
 
                 int index = 0;
                 if (child != null)

src/ImageSharp/Processing/Processors/Quantization/PaletteQuantizer{TPixel}.cs

@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.CompilerServices;
@@ -68,7 +67,6 @@ public readonly byte GetQuantizedColor(TPixel color, out TPixel match)
     /// <inheritdoc/>
     public void Dispose()
     {
-        this.pixelMap?.Dispose();
-        this.pixelMap = null;
+        this.pixelMap.Dispose();
     }
 }

src/ImageSharp/Processing/Processors/Quantization/QuantizerOptions.cs

@@ -17,7 +17,7 @@ public class QuantizerOptions
     /// Gets or sets the  algorithm to apply to the output image.
     /// Defaults to <see cref="QuantizerConstants.DefaultDither"/>; set to <see langword="null"/> for no dithering.
     /// </summary>
-    public IDither Dither { get; set; } = QuantizerConstants.DefaultDither;
+    public IDither? Dither { get; set; } = QuantizerConstants.DefaultDither;
 
     /// <summary>
     /// Gets or sets the dithering scale used to adjust the amount of dither. Range 0..1.

src/ImageSharp/Processing/Processors/Quantization/QuantizerUtilities.cs

@@ -146,7 +146,7 @@ private static void SecondPass<TFrameQuantizer, TPixel>(
         where TFrameQuantizer : struct, IQuantizer<TPixel>
         where TPixel : unmanaged, IPixel<TPixel>
     {
-        IDither dither = quantizer.Options.Dither;
+        IDither? dither = quantizer.Options.Dither;
         Buffer2D<TPixel> sourceBuffer = source.PixelBuffer;
 
         if (dither is null)

src/ImageSharp/Processing/Processors/Quantization/WuQuantizer{TPixel}.cs

@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using System.Buffers;
 using System.Diagnostics.CodeAnalysis;
@@ -76,7 +75,7 @@ internal struct WuQuantizer<TPixel> : IQuantizer<TPixel>
     private ReadOnlyMemory<TPixel> palette;
     private int maxColors;
     private readonly Box[] colorCube;
-    private EuclideanPixelMap<TPixel> pixelMap;
+    private EuclideanPixelMap<TPixel>? pixelMap;
     private readonly bool isDithering;
     private bool isDisposed;
 
@@ -175,7 +174,7 @@ public readonly byte GetQuantizedColor(TPixel color, out TPixel match)
     {
         if (this.isDithering)
         {
-            return (byte)this.pixelMap.GetClosestColor(color, out match);
+            return (byte)this.pixelMap!.GetClosestColor(color, out match);
         }
 
         Rgba32 rgba = default;
@@ -203,9 +202,6 @@ public void Dispose()
             this.momentsOwner?.Dispose();
             this.tagsOwner?.Dispose();
             this.paletteOwner?.Dispose();
-            this.momentsOwner = null;
-            this.tagsOwner = null;
-            this.paletteOwner = null;
             this.pixelMap?.Dispose();
             this.pixelMap = null;
         }
@@ -869,7 +865,7 @@ private struct Box : IEquatable<Box>
         public int Volume;
 
         /// <inheritdoc/>
-        public override readonly bool Equals(object obj)
+        public override readonly bool Equals(object? obj)
             => obj is Box box
             && this.Equals(box);
 

src/ImageSharp/Processing/Processors/Transforms/Linear/AffineTransformProcessor{TPixel}.cs

@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using System.Numerics;
 using System.Runtime.CompilerServices;
@@ -20,8 +19,8 @@ internal class AffineTransformProcessor<TPixel> : TransformProcessor<TPixel>, IR
     private readonly Size destinationSize;
     private readonly Matrix3x2 transformMatrix;
     private readonly IResampler resampler;
-    private ImageFrame<TPixel> source;
-    private ImageFrame<TPixel> destination;
+    private ImageFrame<TPixel>? source;
+    private ImageFrame<TPixel>? destination;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="AffineTransformProcessor{TPixel}"/> class.
@@ -53,8 +52,8 @@ public void ApplyTransform<TResampler>(in TResampler sampler)
         where TResampler : struct, IResampler
     {
         Configuration configuration = this.Configuration;
-        ImageFrame<TPixel> source = this.source;
-        ImageFrame<TPixel> destination = this.destination;
+        ImageFrame<TPixel> source = this.source!;
+        ImageFrame<TPixel> destination = this.destination!;
         Matrix3x2 matrix = this.transformMatrix;
 
         // Handle transforms that result in output identical to the original.