Fix last nullable issues

Author: JimBobSquarePants

src/ImageSharp.Web/FormattedImage.cs

@@ -1,8 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
-using System.Runtime.CompilerServices;
+using System.Diagnostics.CodeAnalysis;
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.Formats;
 using SixLabors.ImageSharp.Metadata.Profiles.Exif;
@@ -40,14 +39,15 @@ private FormattedImage(Image image, IImageFormat format, bool keepOpen)
     {
         this.Image = image;
         this.imageFormatsManager = image.GetConfiguration().ImageFormatsManager;
-        this.Format = format;
+        this.format = format;
+        this.encoder = this.imageFormatsManager.GetEncoder(format);
         this.keepOpen = keepOpen;
     }
 
     /// <summary>
     /// Gets the decoded image.
     /// </summary>
-    public Image Image { get; private set; }
+    public Image Image { get; }
 
     /// <summary>
     /// Gets or sets the format.
@@ -105,7 +105,7 @@ internal static async Task<FormattedImage> LoadAsync<TPixel>(DecoderOptions opti
         // For example. If a resize command has been passed with no extra resampling options
         // then we should apply those changes on decode. This will allow memory savings and performance improvements.
         Image<TPixel> image = await Image.LoadAsync<TPixel>(options, source);
-        return new FormattedImage(image, image.Metadata.DecodedImageFormat, false);
+        return new FormattedImage(image, image.Metadata.DecodedImageFormat!, false);
     }
 
     /// <summary>
@@ -117,7 +117,7 @@ internal static async Task<FormattedImage> LoadAsync<TPixel>(DecoderOptions opti
     internal static async Task<FormattedImage> LoadAsync(DecoderOptions options, Stream source)
     {
         Image image = await Image.LoadAsync(options, source);
-        return new FormattedImage(image, image.Metadata.DecodedImageFormat, false);
+        return new FormattedImage(image, image.Metadata.DecodedImageFormat!, false);
     }
 
     /// <summary>
@@ -143,7 +143,7 @@ public bool TryGetExifOrientation(out ushort value)
         value = ExifOrientationMode.Unknown;
         if (this.Image.Metadata.ExifProfile != null)
         {
-            if (!this.Image.Metadata.ExifProfile.TryGetValue(ExifTag.Orientation, out IExifValue<ushort> orientation))
+            if (!this.Image.Metadata.ExifProfile.TryGetValue(ExifTag.Orientation, out IExifValue<ushort>? orientation))
             {
                 return false;
             }
@@ -172,13 +172,12 @@ public void Dispose()
         if (!this.keepOpen)
         {
             this.Image?.Dispose();
-            this.Image = null;
         }
     }
 
-    [MethodImpl(MethodImplOptions.NoInlining)]
+    [DoesNotReturn]
     private static void ThrowNull(string name) => throw new ArgumentNullException(name);
 
-    [MethodImpl(MethodImplOptions.NoInlining)]
+    [DoesNotReturn]
     private static void ThrowInvalid(string name) => throw new ArgumentException(name);
 }

src/ImageSharp.Web/Providers/FileProviderImageProvider.cs

@@ -52,12 +52,16 @@ public virtual bool IsValidRequest(HttpContext context)
     /// <inheritdoc/>
     public Task<IImageResolver?> GetAsync(HttpContext context)
     {
-        IFileInfo fileInfo = this.fileProvider.GetFileInfo(context.Request.Path.Value);
-        if (!fileInfo.Exists)
+        string? path = context.Request.Path.Value;
+        if (path is not null)
         {
-            return Task.FromResult<IImageResolver?>(null);
+            IFileInfo fileInfo = this.fileProvider.GetFileInfo(path);
+            if (fileInfo.Exists)
+            {
+                return Task.FromResult<IImageResolver?>(new FileProviderImageResolver(fileInfo));
+            }
         }
 
-        return Task.FromResult<IImageResolver?>(new FileProviderImageResolver(fileInfo));
+        return Task.FromResult<IImageResolver?>(null);
     }
 }