Enable Nullable ReferenceTypes

src/ImageSharp/Advanced/AdvancedImageExtensions.cs

@@ -27,7 +27,7 @@ public static IImageEncoder DetectEncoder(this Image source, string filePath)
         Guard.NotNull(filePath, nameof(filePath));
 
         string ext = Path.GetExtension(filePath);
-        IImageFormat format = source.GetConfiguration().ImageFormatsManager.FindFormatByFileExtension(ext);
+        IImageFormat? format = source.GetConfiguration().ImageFormatsManager.FindFormatByFileExtension(ext);
         if (format is null)
         {
             StringBuilder sb = new();
@@ -40,7 +40,7 @@ public static IImageEncoder DetectEncoder(this Image source, string filePath)
             throw new NotSupportedException(sb.ToString());
         }
 
-        IImageEncoder encoder = source.GetConfiguration().ImageFormatsManager.FindEncoder(format);
+        IImageEncoder? encoder = source.GetConfiguration().ImageFormatsManager.FindEncoder(format);
 
         if (encoder is null)
         {
@@ -99,7 +99,7 @@ public static Configuration GetConfiguration(this ImageFrame source)
     /// <param name="source">The source image</param>
     /// <returns>Returns the bounds of the image</returns>
     private static Configuration GetConfiguration(IConfigurationProvider source)
-        => source?.Configuration ?? Configuration.Default;
+        => source.Configuration ?? Configuration.Default;
 
     /// <summary>
     /// Gets the representation of the pixels as a <see cref="IMemoryGroup{T}"/> containing the backing pixel data of the image
@@ -115,7 +115,7 @@ private static Configuration GetConfiguration(IConfigurationProvider source)
     /// <exception cref="ArgumentNullException">Thrown when the <paramref name="source"/> in <see langword="null"/>.</exception>
     public static IMemoryGroup<TPixel> GetPixelMemoryGroup<TPixel>(this ImageFrame<TPixel> source)
         where TPixel : unmanaged, IPixel<TPixel>
-        => source?.PixelBuffer.FastMemoryGroup.View ?? throw new ArgumentNullException(nameof(source));
+        => source.PixelBuffer!.FastMemoryGroup.View ?? throw new ArgumentNullException(nameof(source));
 
     /// <summary>
     /// Gets the representation of the pixels as a <see cref="IMemoryGroup{T}"/> containing the backing pixel data of the image
@@ -131,7 +131,7 @@ public static IMemoryGroup<TPixel> GetPixelMemoryGroup<TPixel>(this ImageFrame<T
     /// <exception cref="ArgumentNullException">Thrown when the <paramref name="source"/> in <see langword="null"/>.</exception>
     public static IMemoryGroup<TPixel> GetPixelMemoryGroup<TPixel>(this Image<TPixel> source)
         where TPixel : unmanaged, IPixel<TPixel>
-        => source?.Frames.RootFrame.GetPixelMemoryGroup() ?? throw new ArgumentNullException(nameof(source));
+        => source.Frames.RootFrame.GetPixelMemoryGroup() ?? throw new ArgumentNullException(nameof(source));
 
     /// <summary>
     /// Gets the representation of the pixels as a <see cref="Span{T}"/> of contiguous memory
@@ -148,7 +148,7 @@ public static Memory<TPixel> DangerousGetPixelRowMemory<TPixel>(this ImageFrame<
         Guard.MustBeGreaterThanOrEqualTo(rowIndex, 0, nameof(rowIndex));
         Guard.MustBeLessThan(rowIndex, source.Height, nameof(rowIndex));
 
-        return source.PixelBuffer.GetSafeRowMemory(rowIndex);
+        return source.PixelBuffer!.GetSafeRowMemory(rowIndex);
     }
 
     /// <summary>
@@ -166,7 +166,7 @@ public static Memory<TPixel> DangerousGetPixelRowMemory<TPixel>(this Image<TPixe
         Guard.MustBeGreaterThanOrEqualTo(rowIndex, 0, nameof(rowIndex));
         Guard.MustBeLessThan(rowIndex, source.Height, nameof(rowIndex));
 
-        return source.Frames.RootFrame.PixelBuffer.GetSafeRowMemory(rowIndex);
+        return source.Frames.RootFrame.PixelBuffer!.GetSafeRowMemory(rowIndex);
     }
 
     /// <summary>

src/ImageSharp/Advanced/AotCompilerTools.cs

@@ -1,6 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
+#nullable disable
 using System.Diagnostics.CodeAnalysis;
 using System.Numerics;
 using System.Runtime.CompilerServices;

src/ImageSharp/Advanced/IConfigurationProvider.cs

@@ -11,5 +11,5 @@ internal interface IConfigurationProvider
     /// <summary>
     /// Gets the configuration which allows altering default behaviour or extending the library.
     /// </summary>
-    Configuration Configuration { get; }
+    Configuration? Configuration { get; }
 }

src/ImageSharp/Advanced/IPixelSource.cs

@@ -27,5 +27,5 @@ internal interface IPixelSource<TPixel>
     /// <summary>
     /// Gets the pixel buffer.
     /// </summary>
-    Buffer2D<TPixel> PixelBuffer { get; }
+    Buffer2D<TPixel>? PixelBuffer { get; }
 }

src/ImageSharp/Color/Color.cs

@@ -19,7 +19,7 @@ namespace SixLabors.ImageSharp;
 public readonly partial struct Color : IEquatable<Color>
 {
     private readonly Rgba64 data;
-    private readonly IPixel boxedHighPrecisionPixel;
+    private readonly IPixel? boxedHighPrecisionPixel;
 
     [MethodImpl(InliningOptions.ShortMethod)]
     private Color(byte r, byte g, byte b, byte a)
@@ -316,7 +316,7 @@ public bool Equals(Color other)
     }
 
     /// <inheritdoc />
-    public override bool Equals(object obj) => obj is Color other && this.Equals(other);
+    public override bool Equals(object? obj) => obj is Color other && this.Equals(other);
 
     /// <inheritdoc />
     [MethodImpl(InliningOptions.ShortMethod)]

src/ImageSharp/ColorSpaces/CieLab.cs

@@ -123,7 +123,7 @@ public CieLab(Vector3 vector, CieXyz whitePoint)
     public override string ToString() => FormattableString.Invariant($"CieLab({this.L:#0.##}, {this.A:#0.##}, {this.B:#0.##})");
 
     /// <inheritdoc/>
-    public override bool Equals(object obj) => obj is CieLab other && this.Equals(other);
+    public override bool Equals(object? obj) => obj is CieLab other && this.Equals(other);
 
     /// <inheritdoc/>
     [MethodImpl(InliningOptions.ShortMethod)]

src/ImageSharp/ColorSpaces/CieLch.cs

@@ -127,7 +127,7 @@ public override int GetHashCode()
 
     /// <inheritdoc/>
     [MethodImpl(InliningOptions.ShortMethod)]
-    public override bool Equals(object obj) => obj is CieLch other && this.Equals(other);
+    public override bool Equals(object? obj) => obj is CieLch other && this.Equals(other);
 
     /// <inheritdoc/>
     [MethodImpl(InliningOptions.ShortMethod)]

src/ImageSharp/ColorSpaces/CieLchuv.cs

@@ -124,7 +124,7 @@ public CieLchuv(Vector3 vector, CieXyz whitePoint)
     public override string ToString() => FormattableString.Invariant($"CieLchuv({this.L:#0.##}, {this.C:#0.##}, {this.H:#0.##})");
 
     /// <inheritdoc/>
-    public override bool Equals(object obj) => obj is CieLchuv other && this.Equals(other);
+    public override bool Equals(object? obj) => obj is CieLchuv other && this.Equals(other);
 
     /// <inheritdoc/>
     [MethodImpl(InliningOptions.ShortMethod)]

src/ImageSharp/ColorSpaces/CieLuv.cs

@@ -124,7 +124,7 @@ public CieLuv(Vector3 vector, CieXyz whitePoint)
     public override string ToString() => FormattableString.Invariant($"CieLuv({this.L:#0.##}, {this.U:#0.##}, {this.V:#0.##})");
 
     /// <inheritdoc/>
-    public override bool Equals(object obj) => obj is CieLuv other && this.Equals(other);
+    public override bool Equals(object? obj) => obj is CieLuv other && this.Equals(other);
 
     /// <inheritdoc/>
     [MethodImpl(InliningOptions.ShortMethod)]

src/ImageSharp/ColorSpaces/CieXyy.cs

@@ -88,7 +88,7 @@ public CieXyy(Vector3 vector)
     public override string ToString() => FormattableString.Invariant($"CieXyy({this.X:#0.##}, {this.Y:#0.##}, {this.Yl:#0.##})");
 
     /// <inheritdoc/>
-    public override bool Equals(object obj) => obj is CieXyy other && this.Equals(other);
+    public override bool Equals(object? obj) => obj is CieXyy other && this.Equals(other);
 
     /// <inheritdoc/>
     [MethodImpl(InliningOptions.ShortMethod)]

src/ImageSharp/ColorSpaces/CieXyz.cs

@@ -91,7 +91,7 @@ public CieXyz(Vector3 vector)
     public override string ToString() => FormattableString.Invariant($"CieXyz({this.X:#0.##}, {this.Y:#0.##}, {this.Z:#0.##})");
 
     /// <inheritdoc/>
-    public override bool Equals(object obj) => obj is CieXyz other && this.Equals(other);
+    public override bool Equals(object? obj) => obj is CieXyz other && this.Equals(other);
 
     /// <inheritdoc/>
     [MethodImpl(InliningOptions.ShortMethod)]

src/ImageSharp/ColorSpaces/Cmyk.cs

@@ -95,7 +95,7 @@ public Cmyk(Vector4 vector)
     public override string ToString() => FormattableString.Invariant($"Cmyk({this.C:#0.##}, {this.M:#0.##}, {this.Y:#0.##}, {this.K:#0.##})");
 
     /// <inheritdoc/>
-    public override bool Equals(object obj) => obj is Cmyk other && this.Equals(other);
+    public override bool Equals(object? obj) => obj is Cmyk other && this.Equals(other);
 
     /// <inheritdoc/>
     [MethodImpl(InliningOptions.ShortMethod)]

src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Adapt.cs

@@ -32,7 +32,7 @@ public CieXyz Adapt(in CieXyz color, in CieXyz sourceWhitePoint, in CieXyz targe
             return color;
         }
 
-        return this.chromaticAdaptation.Transform(color, sourceWhitePoint, targetWhitePoint);
+        return this.chromaticAdaptation!.Transform(color, sourceWhitePoint, targetWhitePoint);
     }
 
     /// <summary>
@@ -132,7 +132,7 @@ public LinearRgb Adapt(in LinearRgb color)
         CieXyz unadapted = converterToXYZ.Convert(color);
 
         // Adaptation
-        CieXyz adapted = this.chromaticAdaptation.Transform(unadapted, color.WorkingSpace.WhitePoint, this.targetRgbWorkingSpace.WhitePoint);
+        CieXyz adapted = this.chromaticAdaptation!.Transform(unadapted, color.WorkingSpace.WhitePoint, this.targetRgbWorkingSpace.WhitePoint);
 
         // Conversion back to RGB
         return this.cieXyzToLinearRgbConverter.Convert(adapted);

src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieXyz.cs

@@ -13,7 +13,7 @@ public partial class ColorSpaceConverter
 {
     private static readonly HunterLabToCieXyzConverter HunterLabToCieXyzConverter = new();
 
-    private LinearRgbToCieXyzConverter linearRgbToCieXyzConverter;
+    private LinearRgbToCieXyzConverter? linearRgbToCieXyzConverter;
 
     /// <summary>
     /// Converts a <see cref="CieLab"/> into a <see cref="CieXyz"/>.

src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.cs

@@ -18,7 +18,7 @@ public partial class ColorSpaceConverter
     private readonly CieXyz targetLabWhitePoint;
     private readonly CieXyz targetHunterLabWhitePoint;
     private readonly RgbWorkingSpace targetRgbWorkingSpace;
-    private readonly IChromaticAdaptation chromaticAdaptation;
+    private readonly IChromaticAdaptation? chromaticAdaptation;
     private readonly bool performChromaticAdaptation;
     private readonly CieXyzAndLmsConverter cieXyzAndLmsConverter;
     private readonly CieXyzToCieLabConverter cieXyzToCieLabConverter;

src/ImageSharp/ColorSpaces/Conversion/Implementation/CieXyChromaticityCoordinates.cs

@@ -73,7 +73,7 @@ public override string ToString()
         => FormattableString.Invariant($"CieXyChromaticityCoordinates({this.X:#0.##}, {this.Y:#0.##})");
 
     /// <inheritdoc/>
-    public override bool Equals(object obj)
+    public override bool Equals(object? obj)
         => obj is CieXyChromaticityCoordinates other && this.Equals(other);
 
     /// <inheritdoc/>

src/ImageSharp/ColorSpaces/Conversion/Implementation/RGBPrimariesChromaticityCoordinates.cs

@@ -72,7 +72,7 @@ public RgbPrimariesChromaticityCoordinates(CieXyChromaticityCoordinates r, CieXy
     }
 
     /// <inheritdoc/>
-    public override bool Equals(object obj)
+    public override bool Equals(object? obj)
     {
         return obj is RgbPrimariesChromaticityCoordinates other && this.Equals(other);
     }

src/ImageSharp/ColorSpaces/Conversion/Implementation/WorkingSpaces/GammaWorkingSpace.cs

@@ -34,7 +34,7 @@ public GammaWorkingSpace(float gamma, CieXyz referenceWhite, RgbPrimariesChromat
     public override float Expand(float channel) => GammaCompanding.Expand(channel, this.Gamma);
 
     /// <inheritdoc/>
-    public override bool Equals(object obj)
+    public override bool Equals(object? obj)
     {
         if (obj is null)
         {

src/ImageSharp/ColorSpaces/Conversion/Implementation/WorkingSpaces/RgbWorkingSpace.cs

@@ -52,7 +52,7 @@ protected RgbWorkingSpace(CieXyz referenceWhite, RgbPrimariesChromaticityCoordin
     public abstract float Compress(float channel);
 
     /// <inheritdoc/>
-    public override bool Equals(object obj)
+    public override bool Equals(object? obj)
     {
         if (obj is null)
         {

src/ImageSharp/ColorSpaces/Hsl.cs

@@ -89,7 +89,7 @@ public Hsl(Vector3 vector)
     public override string ToString() => FormattableString.Invariant($"Hsl({this.H:#0.##}, {this.S:#0.##}, {this.L:#0.##})");
 
     /// <inheritdoc/>
-    public override bool Equals(object obj) => obj is Hsl other && this.Equals(other);
+    public override bool Equals(object? obj) => obj is Hsl other && this.Equals(other);
 
     /// <inheritdoc/>
     [MethodImpl(InliningOptions.ShortMethod)]

src/ImageSharp/ColorSpaces/Hsv.cs

@@ -87,7 +87,7 @@ public Hsv(Vector3 vector)
     public override string ToString() => FormattableString.Invariant($"Hsv({this.H:#0.##}, {this.S:#0.##}, {this.V:#0.##})");
 
     /// <inheritdoc/>
-    public override bool Equals(object obj) => obj is Hsv other && this.Equals(other);
+    public override bool Equals(object? obj) => obj is Hsv other && this.Equals(other);
 
     /// <inheritdoc/>
     [MethodImpl(InliningOptions.ShortMethod)]

src/ImageSharp/ColorSpaces/HunterLab.cs

@@ -122,7 +122,7 @@ public HunterLab(Vector3 vector, CieXyz whitePoint)
     public override string ToString() => FormattableString.Invariant($"HunterLab({this.L:#0.##}, {this.A:#0.##}, {this.B:#0.##})");
 
     /// <inheritdoc/>
-    public override bool Equals(object obj) => obj is HunterLab other && this.Equals(other);
+    public override bool Equals(object? obj) => obj is HunterLab other && this.Equals(other);
 
     /// <inheritdoc/>
     [MethodImpl(InliningOptions.ShortMethod)]

src/ImageSharp/ColorSpaces/LinearRgb.cs

@@ -131,7 +131,7 @@ public LinearRgb(Vector3 vector, RgbWorkingSpace workingSpace)
     public override string ToString() => FormattableString.Invariant($"LinearRgb({this.R:#0.##}, {this.G:#0.##}, {this.B:#0.##})");
 
     /// <inheritdoc/>
-    public override bool Equals(object obj) => obj is LinearRgb other && this.Equals(other);
+    public override bool Equals(object? obj) => obj is LinearRgb other && this.Equals(other);
 
     /// <inheritdoc/>
     [MethodImpl(InliningOptions.ShortMethod)]

src/ImageSharp/ColorSpaces/Lms.cs

@@ -92,7 +92,7 @@ public Lms(Vector3 vector)
     public override string ToString() => FormattableString.Invariant($"Lms({this.L:#0.##}, {this.M:#0.##}, {this.S:#0.##})");
 
     /// <inheritdoc/>
-    public override bool Equals(object obj) => obj is Lms other && this.Equals(other);
+    public override bool Equals(object? obj) => obj is Lms other && this.Equals(other);
 
     /// <inheritdoc/>
     [MethodImpl(InliningOptions.ShortMethod)]

src/ImageSharp/ColorSpaces/Rgb.cs

@@ -152,7 +152,7 @@ public Rgb(Vector3 vector, RgbWorkingSpace workingSpace)
     public override string ToString() => FormattableString.Invariant($"Rgb({this.R:#0.##}, {this.G:#0.##}, {this.B:#0.##})");
 
     /// <inheritdoc/>
-    public override bool Equals(object obj) => obj is Rgb other && this.Equals(other);
+    public override bool Equals(object? obj) => obj is Rgb other && this.Equals(other);
 
     /// <inheritdoc/>
     [MethodImpl(InliningOptions.ShortMethod)]

src/ImageSharp/ColorSpaces/YCbCr.cs

@@ -88,7 +88,7 @@ public YCbCr(Vector3 vector)
     public override string ToString() => FormattableString.Invariant($"YCbCr({this.Y}, {this.Cb}, {this.Cr})");
 
     /// <inheritdoc/>
-    public override bool Equals(object obj) => obj is YCbCr other && this.Equals(other);
+    public override bool Equals(object? obj) => obj is YCbCr other && this.Equals(other);
 
     /// <inheritdoc/>
     [MethodImpl(InliningOptions.ShortMethod)]

src/ImageSharp/Common/Helpers/Guard.cs

@@ -17,6 +17,7 @@ internal static partial class Guard
     /// <exception cref="ArgumentException"><paramref name="value"/> is not a value type.</exception>
     [MethodImpl(InliningOptions.ShortMethod)]
     public static void MustBeValueType<TValue>(TValue value, string parameterName)
+        where TValue : class
     {
         if (value.GetType().IsValueType)
         {

src/ImageSharp/Common/Helpers/UnitConverter.cs

@@ -91,7 +91,7 @@ internal static class UnitConverter
     [MethodImpl(InliningOptions.ShortMethod)]
     public static PixelResolutionUnit ExifProfileToResolutionUnit(ExifProfile profile)
     {
-        IExifValue<ushort> resolution = profile.GetValue(ExifTag.ResolutionUnit);
+        IExifValue<ushort>? resolution = profile.GetValue(ExifTag.ResolutionUnit);
 
         // EXIF is 1, 2, 3 so we minus "1" off the result.
         return resolution is null ? DefaultResolutionUnit : (PixelResolutionUnit)(byte)(resolution.Value - 1);

src/ImageSharp/Compression/Zlib/Deflater.cs

@@ -284,7 +284,6 @@ public void Dispose()
         if (!this.isDisposed)
         {
             this.engine.Dispose();
-            this.engine = null;
             this.isDisposed = true;
         }
     }

src/ImageSharp/Compression/Zlib/DeflaterEngine.cs

@@ -86,7 +86,7 @@ internal sealed unsafe class DeflaterEngine : IDisposable
     /// <summary>
     /// The input data for compression.
     /// </summary>
-    private byte[] inputBuf;
+    private byte[]? inputBuf;
 
     /// <summary>
     /// The offset into inputBuf, where input data starts.
@@ -221,12 +221,9 @@ public bool Deflate(bool flush, bool finish)
     /// <param name="buffer">The buffer containing input data.</param>
     /// <param name="offset">The offset of the first byte of data.</param>
     /// <param name="count">The number of bytes of data to use as input.</param>
-    public void SetInput(byte[] buffer, int offset, int count)
+    public void SetInput(byte[]? buffer, int offset, int count)
     {
-        if (buffer is null)
-        {
-            DeflateThrowHelper.ThrowNull(nameof(buffer));
-        }
+        ArgumentNullException.ThrowIfNull(buffer);
 
         if (offset < 0)
         {
@@ -342,7 +339,7 @@ public void SetLevel(int level)
     /// <summary>
     /// Fill the window
     /// </summary>
-    public void FillWindow()
+    private void FillWindow()
     {
         // If the window is almost full and there is insufficient lookahead,
         // move the upper half to the lower one to make room in the upper half.
@@ -361,6 +358,8 @@ public void FillWindow()
                 more = this.inputEnd - this.inputOff;
             }
 
+            ArgumentNullException.ThrowIfNull(this.inputBuf);
+
             Unsafe.CopyBlockUnaligned(
                 ref this.window.Span[this.strstart + this.lookahead],
                 ref this.inputBuf[this.inputOff],
@@ -392,11 +391,6 @@ public void Dispose()
             this.prevMemoryHandle.Dispose();
             this.prevMemoryOwner.Dispose();
 
-            this.windowMemoryOwner = null;
-            this.headMemoryOwner = null;
-            this.prevMemoryOwner = null;
-            this.huffman = null;
-
             this.isDisposed = true;
         }
     }