Upgrade to .NET 7

nullpainter · Apr 18, 2023 · e5c0b0b · e5c0b0b
1 parent e4e64e9
commit e5c0b0b
Show file tree

Hide file tree

Showing 57 changed files with 96 additions and 149 deletions.
diff --git a/Sanchez.Processing/Extensions/ColorExtensions.cs b/Sanchez.Processing/Extensions/ColorExtensions.cs
@@ -1,6 +1,4 @@
-using SixLabors.ImageSharp;
-
-namespace Sanchez.Processing.Extensions;
+namespace Sanchez.Processing.Extensions;
 
 public static class ColorExtensions
 {

diff --git a/Sanchez.Processing/Extensions/Images/BackgroundExtensions.cs b/Sanchez.Processing/Extensions/Images/BackgroundExtensions.cs
@@ -1,8 +1,4 @@
-using SixLabors.ImageSharp;
-using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing;
-
-namespace Sanchez.Processing.Extensions.Images;
+namespace Sanchez.Processing.Extensions.Images;
 
 public static class BackgroundExtensions
 {

diff --git a/Sanchez.Processing/Extensions/Images/BorderCropExtensions.cs b/Sanchez.Processing/Extensions/Images/BorderCropExtensions.cs
@@ -1,7 +1,4 @@
 using Serilog;
-using SixLabors.ImageSharp;
-using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing;
 
 namespace Sanchez.Processing.Extensions.Images;
 

diff --git a/Sanchez.Processing/Extensions/Images/DrawImageExtensions.cs b/Sanchez.Processing/Extensions/Images/DrawImageExtensions.cs
@@ -1,8 +1,4 @@
-using SixLabors.ImageSharp;
-using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing;
-
-namespace Sanchez.Processing.Extensions.Images;
+namespace Sanchez.Processing.Extensions.Images;
 
 public static class DrawImageExtensions
 {

diff --git a/Sanchez.Processing/Extensions/Images/HistogramExtensions.cs b/Sanchez.Processing/Extensions/Images/HistogramExtensions.cs
@@ -1,7 +1,4 @@
-using SixLabors.ImageSharp;
-using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Processors.Normalization;
+using SixLabors.ImageSharp.Processing.Processors.Normalization;
 
 namespace Sanchez.Processing.Extensions.Images;
 

diff --git a/Sanchez.Processing/Extensions/Images/ImageExtensions.cs b/Sanchez.Processing/Extensions/Images/ImageExtensions.cs
@@ -1,10 +1,8 @@
 using System.ComponentModel.DataAnnotations;
 using System.Reflection;
 using ExifLibrary;
-using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.Formats.Jpeg;
-using SixLabors.ImageSharp.PixelFormats;
 
 namespace Sanchez.Processing.Extensions.Images;
 
@@ -24,8 +22,18 @@ public static async Task SaveWithExifAsync(this Image<Rgba32> image, string path
 
         // Save image, increasing JPEG quality
         var encoder = image.DetectEncoder(path);
-        if (encoder is JpegEncoder jpegEncoder) jpegEncoder.Quality = 95;
 
+        if (encoder is JpegEncoder jpegEncoder)
+        {
+            encoder = new JpegEncoder
+            {
+                Quality = 95,
+                Interleaved = jpegEncoder.Interleaved,
+                ColorType = jpegEncoder.ColorType,
+                SkipMetadata = jpegEncoder.SkipMetadata
+            };
+        }
+
         try
         {
             await image.SaveAsync(path, encoder, ct);

diff --git a/Sanchez.Processing/Extensions/Images/InterpolationExtensions.cs b/Sanchez.Processing/Extensions/Images/InterpolationExtensions.cs
@@ -1,6 +1,5 @@
 using Sanchez.Processing.Models;
 using Sanchez.Processing.Models.Configuration;
-using SixLabors.ImageSharp.PixelFormats;
 
 namespace Sanchez.Processing.Extensions.Images;
 

diff --git a/Sanchez.Processing/Extensions/Images/RegistrationExtensions.cs b/Sanchez.Processing/Extensions/Images/RegistrationExtensions.cs
@@ -1,7 +1,6 @@
 using Sanchez.Processing.ImageProcessing.Mask;
 using Sanchez.Processing.Models;
 using Sanchez.Processing.Models.Projections;
-using SixLabors.ImageSharp.Processing;
 
 namespace Sanchez.Processing.Extensions.Images;
 

diff --git a/Sanchez.Processing/Helpers/PathHelper.cs b/Sanchez.Processing/Helpers/PathHelper.cs
@@ -28,7 +28,7 @@ public static class PathHelper
     /// </summary>
     private static string GetApplicationPath()
     {
-        var processFilename = Process.GetCurrentProcess().MainModule!.FileName;
+        var processFilename = Environment.ProcessPath;
 
         // Determine correct location of directories relative to application, depending on whether we are running
         // from a published executable or via dotnet.

diff --git a/Sanchez.Processing/Helpers/ProgressBarFactory.cs b/Sanchez.Processing/Helpers/ProgressBarFactory.cs
@@ -25,7 +25,7 @@ public static IProgressBar NewProgressBar(RenderOptions options, int maxTicks, s
 
     public static ProgressBarOptions DefaultOptions()
     {
-        return new()
+        return new ProgressBarOptions
         {
             ProgressCharacter = '─',
             ProgressBarOnBottom = true,

diff --git a/Sanchez.Processing/ImageProcessing/Atmosphere/AtmosphereExtensions.cs b/Sanchez.Processing/ImageProcessing/Atmosphere/AtmosphereExtensions.cs
@@ -1,8 +1,5 @@
 using System.Collections.ObjectModel;
-using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing;
 
 namespace Sanchez.Processing.ImageProcessing.Atmosphere;
 

diff --git a/Sanchez.Processing/ImageProcessing/Atmosphere/AtmosphereRowOperation.cs b/Sanchez.Processing/ImageProcessing/Atmosphere/AtmosphereRowOperation.cs
@@ -1,10 +1,8 @@
 using System.Collections.ObjectModel;
 using System.Numerics;
 using Sanchez.Processing.Models;
-using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.ColorSpaces;
 using SixLabors.ImageSharp.ColorSpaces.Conversion;
-using SixLabors.ImageSharp.PixelFormats;
 
 namespace Sanchez.Processing.ImageProcessing.Atmosphere;
 

diff --git a/Sanchez.Processing/ImageProcessing/Crop/EwsAlignmentRowOperation.cs b/Sanchez.Processing/ImageProcessing/Crop/EwsAlignmentRowOperation.cs
@@ -1,7 +1,5 @@
 using System.Collections.Concurrent;
 using System.Numerics;
-using SixLabors.ImageSharp;
-using SixLabors.ImageSharp.PixelFormats;
 
 namespace Sanchez.Processing.ImageProcessing.Crop;
 

diff --git a/Sanchez.Processing/ImageProcessing/Intensity/IntensityRangeHelper.cs b/Sanchez.Processing/ImageProcessing/Intensity/IntensityRangeHelper.cs
@@ -1,7 +1,4 @@
 using Sanchez.Processing.Models.Angles;
-using SixLabors.ImageSharp;
-using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing;
 
 namespace Sanchez.Processing.ImageProcessing.Intensity;
 

diff --git a/Sanchez.Processing/ImageProcessing/Lookup/ApplyLookupRowOperation.cs b/Sanchez.Processing/ImageProcessing/Lookup/ApplyLookupRowOperation.cs
@@ -1,7 +1,5 @@
 using Sanchez.Processing.ImageProcessing.Intensity;
 using Sanchez.Processing.Models.Angles;
-using SixLabors.ImageSharp;
-using SixLabors.ImageSharp.PixelFormats;
 
 namespace Sanchez.Processing.ImageProcessing.Lookup;
 

diff --git a/Sanchez.Processing/ImageProcessing/Mask/RemoveBackgroundExtensions.cs b/Sanchez.Processing/ImageProcessing/Mask/RemoveBackgroundExtensions.cs
@@ -1,8 +1,4 @@
-using SixLabors.ImageSharp;
-using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing;
-
-namespace Sanchez.Processing.ImageProcessing.Mask;
+namespace Sanchez.Processing.ImageProcessing.Mask;
 
 public static class RemoveBackgroundExtensions
 {

diff --git a/Sanchez.Processing/ImageProcessing/Mask/RemoveBackgroundRowOperation.cs b/Sanchez.Processing/ImageProcessing/Mask/RemoveBackgroundRowOperation.cs
@@ -1,7 +1,5 @@
 using System.Numerics;
 using Sanchez.Processing.Models;
-using SixLabors.ImageSharp;
-using SixLabors.ImageSharp.PixelFormats;
 
 namespace Sanchez.Processing.ImageProcessing.Mask;
 

diff --git a/Sanchez.Processing/ImageProcessing/Noise/GaussianNoiseRowOperation.cs b/Sanchez.Processing/ImageProcessing/Noise/GaussianNoiseRowOperation.cs
@@ -1,6 +1,5 @@
 using System.Numerics;
 using Sanchez.Processing.Models;
-using SixLabors.ImageSharp.PixelFormats;
 
 namespace Sanchez.Processing.ImageProcessing.Noise;
 

diff --git a/Sanchez.Processing/ImageProcessing/Noise/NoiseExtensions.cs b/Sanchez.Processing/ImageProcessing/Noise/NoiseExtensions.cs
@@ -1,8 +1,4 @@
-using SixLabors.ImageSharp;
-using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing;
-
-namespace Sanchez.Processing.ImageProcessing.Noise;
+namespace Sanchez.Processing.ImageProcessing.Noise;
 
 public static class NoiseExtensions
 {

diff --git a/Sanchez.Processing/ImageProcessing/Offset/OffsetExtensions.cs b/Sanchez.Processing/ImageProcessing/Offset/OffsetExtensions.cs
@@ -1,8 +1,4 @@
-using SixLabors.ImageSharp;
-using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing;
-
-namespace Sanchez.Processing.ImageProcessing.Offset;
+namespace Sanchez.Processing.ImageProcessing.Offset;
 
 public static class OffsetExtensions
 {

diff --git a/Sanchez.Processing/ImageProcessing/Projection/ReprojectRowOperation.cs b/Sanchez.Processing/ImageProcessing/Projection/ReprojectRowOperation.cs
@@ -7,8 +7,6 @@
 using Sanchez.Processing.Models.Configuration;
 using Sanchez.Processing.Models.Projections;
 using Sanchez.Processing.Projections;
-using SixLabors.ImageSharp;
-using SixLabors.ImageSharp.PixelFormats;
 
 namespace Sanchez.Processing.ImageProcessing.Projection;
 

diff --git a/Sanchez.Processing/ImageProcessing/Tint/TintExtensions.cs b/Sanchez.Processing/ImageProcessing/Tint/TintExtensions.cs
@@ -1,21 +1,16 @@
-using SixLabors.ImageSharp;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing;
+using SixLabors.ImageSharp.ColorSpaces.Conversion;
 
 namespace Sanchez.Processing.ImageProcessing.Tint;
 
 public static class TintExtensions
 {
-    private static readonly ColorSpaceConverter Converter = new(new ColorSpaceConverterOptions());
-
     /// <summary>
     ///     Applies a tint to an image.
     /// </summary>
     public static void Tint(this Image<Rgba32> image, Color colour)
     {
         var tint = colour.ToPixel<Rgba32>();
-        var lightness = 2 * (1 - (Converter.ToHsl(tint).L * 2 - 1));
+        var lightness = 2 * (1 - (ColorSpaceConverter.ToHsl(tint).L * 2 - 1));
 
         var operation = new TintRowOperation(tint, lightness);
         image.Mutate(c => c.ProcessPixelRowsAsVector4(row => operation.Invoke(row)));

diff --git a/Sanchez.Processing/ImageProcessing/Tint/TintRowOperation.cs b/Sanchez.Processing/ImageProcessing/Tint/TintRowOperation.cs
@@ -1,5 +1,4 @@
 using System.Numerics;
-using SixLabors.ImageSharp.PixelFormats;
 
 namespace Sanchez.Processing.ImageProcessing.Tint;
 

diff --git a/Sanchez.Processing/ImageProcessing/Underlay/GeostationaryExtensions.cs b/Sanchez.Processing/ImageProcessing/Underlay/GeostationaryExtensions.cs
@@ -1,7 +1,4 @@
 using Sanchez.Processing.Models;
-using SixLabors.ImageSharp;
-using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing;
 
 namespace Sanchez.Processing.ImageProcessing.Underlay;
 

diff --git a/Sanchez.Processing/ImageProcessing/Underlay/GeostationaryProjectionRowOperation.cs b/Sanchez.Processing/ImageProcessing/Underlay/GeostationaryProjectionRowOperation.cs
@@ -3,8 +3,6 @@
 using Sanchez.Processing.Extensions.Images;
 using Sanchez.Processing.Models;
 using Sanchez.Processing.Projections;
-using SixLabors.ImageSharp;
-using SixLabors.ImageSharp.PixelFormats;
 
 namespace Sanchez.Processing.ImageProcessing.Underlay;
 

diff --git a/Sanchez.Processing/Models/Angles/AngleRange.cs b/Sanchez.Processing/Models/Angles/AngleRange.cs
@@ -22,7 +22,7 @@ public AngleRange(Angle start, Angle end) : this(start.Radians, end.Radians)
     ///     Unwraps a longitude range so the end angle is always greater than the start angle.
     ///     This is to simplify maths for projections which wrap around the standard -180 to 180 degrees.
     /// </summary>
-    public AngleRange UnwrapLongitude() => End < Start ? new AngleRange(Start, End + Constants.Pi2) : this;
+    public AngleRange UnwrapLongitude() => End < Start ? this with { End = End + Constants.Pi2 } : this;
 
     public AngleRange NormaliseLongitude() => new(Start.NormaliseLongitude(), End.NormaliseLongitude());
 

diff --git a/Sanchez.Processing/Models/Constants.cs b/Sanchez.Processing/Models/Constants.cs
@@ -1,6 +1,5 @@
 using Sanchez.Processing.Helpers;
 using Sanchez.Processing.Models.Configuration;
-using SixLabors.ImageSharp.PixelFormats;
 
 namespace Sanchez.Processing.Models;
 

diff --git a/Sanchez.Processing/Models/ImageBuffer.cs b/Sanchez.Processing/Models/ImageBuffer.cs
@@ -1,7 +1,4 @@
-using SixLabors.ImageSharp;
-using SixLabors.ImageSharp.PixelFormats;
-
-namespace Sanchez.Processing.Models;
+namespace Sanchez.Processing.Models;
 
 public class ImageBuffer
 {
@@ -14,7 +11,7 @@ private ImageBuffer(Rgba32[] buffer, Size size)
         Size = size;
     }
 
-    public static ImageBuffer ToBuffer(Image<Rgba32> image) => new(GetBuffer(image), image.Size());
+    public static ImageBuffer ToBuffer(Image<Rgba32> image) => new(GetBuffer(image), image.Size);
 
     private static Rgba32[] GetBuffer(Image<Rgba32> image)
     {

diff --git a/Sanchez.Processing/Models/Projections/Registration.cs b/Sanchez.Processing/Models/Projections/Registration.cs
@@ -1,7 +1,4 @@
 using Sanchez.Processing.Models.Configuration;
-using SixLabors.ImageSharp;
-using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing;
 
 namespace Sanchez.Processing.Models.Projections;
 

diff --git a/Sanchez.Processing/Models/RenderOptions.cs b/Sanchez.Processing/Models/RenderOptions.cs
@@ -1,6 +1,5 @@
 using Sanchez.Processing.Models.Configuration;
 using Sanchez.Processing.Models.Projections;
-using SixLabors.ImageSharp;
 
 namespace Sanchez.Processing.Models;
 
@@ -163,7 +162,7 @@ public bool MultipleTargets
     /// <summary>
     ///     Whether to apply gaussian noise to target image.
     /// </summary>
-    public bool Noise { get; set; }
+    public bool Noise { get; init; }
 
     /// <summary>
     ///     Output image extension, based off <see cref="OutputFormat"/>.

diff --git a/Sanchez.Processing/Models/UnderlayProjectionData.cs b/Sanchez.Processing/Models/UnderlayProjectionData.cs
@@ -2,7 +2,6 @@
 using Sanchez.Processing.Models.Angles;
 using Sanchez.Processing.Models.Configuration;
 using Sanchez.Processing.Models.Projections;
-using SixLabors.ImageSharp;
 
 namespace Sanchez.Processing.Models;
 

diff --git a/Sanchez.Processing/Projections/GeostationaryProjection.cs b/Sanchez.Processing/Projections/GeostationaryProjection.cs
@@ -85,10 +85,10 @@ public static void ToScanningAngle(LatitudeCalculations latitudeCalculations, do
 /// </summary>
 public struct LatitudeCalculations
 {
-    public double Rc { get; set; }
+    public double Rc { get; init; }
     public double RcCosLatitude { get; set; }
-    public double CosLatitude { get; set; }
-    public double Sz { get; set; }
-    public double Sz2 { get; set; }
+    public double CosLatitude { get; init; }
+    public double Sz { get; init; }
+    public double Sz2 { get; init; }
     public double RadiusRatioSz2 { get; set; }
 }
diff --git a/Sanchez.Processing/Projections/ReverseGeostationaryProjection.cs b/Sanchez.Processing/Projections/ReverseGeostationaryProjection.cs
@@ -59,7 +59,6 @@ public static void ToLatitudeLongitude(double scanningX, double scanningY, doubl
     public static void ToLatitudeLongitude(
         double scanningX, VerticalScanningCalculations verticalScanningCalculations, double satelliteLongitude,  out double latitude, out double longitude)
     {
-        var l0 = satelliteLongitude;
         var satelliteHeight = verticalScanningCalculations.SatelliteHeight;
 
         var cosX = Cos(scanningX);
@@ -80,7 +79,7 @@ public static void ToLatitudeLongitude(
         var sz = rs * cosX * sinY;
 
         latitude = Atan(RadiusEquatorSquared / RadiusPolarSquared * (sz / Sqrt((satelliteHeight - sx) * (satelliteHeight - sx) + sy * sy)));
-        longitude = (l0 - Atan(sy / (satelliteHeight - sx))).NormaliseLongitude();
+        longitude = (satelliteLongitude - Atan(sy / (satelliteHeight - sx))).NormaliseLongitude();
     }
 }
 
@@ -90,8 +89,8 @@ public static void ToLatitudeLongitude(
 public struct VerticalScanningCalculations
 {
     public double T { get; set; }
-    public double CosY { get; set; }
-    public double SinY { get; set; }
+    public double CosY { get; init; }
+    public double SinY { get; init; }
     public double C { get; set; }
-    public double SatelliteHeight { get; set; }
+    public double SatelliteHeight { get; init; }
 }