Merge branch 'main' into js/transform-metadata

Author: JimBobSquarePants

.editorconfig

@@ -161,6 +161,9 @@ csharp_style_deconstructed_variable_declaration = true:warning
 csharp_style_prefer_index_operator = true:warning
 csharp_style_prefer_range_operator = true:warning
 csharp_style_implicit_object_creation_when_type_is_apparent = true:error
+# ReSharper inspection severities
+resharper_arrange_object_creation_when_type_evident_highlighting = error
+resharper_arrange_object_creation_when_type_not_evident_highlighting = error
 # "Null" checking preferences
 csharp_style_throw_expression = true:warning
 csharp_style_conditional_delegate_call = true:warning

shared-infrastructure

@@ -139,7 +139,7 @@ public void Invoke(int i)
             }
 
             int yMax = Math.Min(yMin + this.stepY, this.maxY);
-            var rows = new RowInterval(yMin, yMax);
+            RowInterval rows = new(yMin, yMax);
 
             // Skip the safety copy when invoking a potentially impure method on a readonly field
             Unsafe.AsRef(in this.operation).Invoke(in rows);
@@ -185,7 +185,7 @@ public void Invoke(int i)
             }
 
             int yMax = Math.Min(yMin + this.stepY, this.maxY);
-            var rows = new RowInterval(yMin, yMax);
+            RowInterval rows = new(yMin, yMax);
 
             using IMemoryOwner<TBuffer> buffer = this.allocator.Allocate<TBuffer>(this.bufferLength);
 

src/ImageSharp/Advanced/ParallelRowIterator.Wrappers.cs

@@ -26,7 +26,7 @@ public static partial class ParallelRowIterator
     public static void IterateRows<T>(Configuration configuration, Rectangle rectangle, in T operation)
         where T : struct, IRowOperation
     {
-        var parallelSettings = ParallelExecutionSettings.FromConfiguration(configuration);
+        ParallelExecutionSettings parallelSettings = ParallelExecutionSettings.FromConfiguration(configuration);
         IterateRows(rectangle, in parallelSettings, in operation);
     }
 
@@ -65,8 +65,8 @@ public static void IterateRows<T>(
         }
 
         int verticalStep = DivideCeil(rectangle.Height, numOfSteps);
-        var parallelOptions = new ParallelOptions { MaxDegreeOfParallelism = numOfSteps };
-        var wrappingOperation = new RowOperationWrapper<T>(top, bottom, verticalStep, in operation);
+        ParallelOptions parallelOptions = new() { MaxDegreeOfParallelism = numOfSteps };
+        RowOperationWrapper<T> wrappingOperation = new(top, bottom, verticalStep, in operation);
 
         Parallel.For(
             0,
@@ -88,7 +88,7 @@ public static void IterateRows<T, TBuffer>(Configuration configuration, Rectangl
         where T : struct, IRowOperation<TBuffer>
         where TBuffer : unmanaged
     {
-        var parallelSettings = ParallelExecutionSettings.FromConfiguration(configuration);
+        ParallelExecutionSettings parallelSettings = ParallelExecutionSettings.FromConfiguration(configuration);
         IterateRows<T, TBuffer>(rectangle, in parallelSettings, in operation);
     }
 
@@ -135,8 +135,8 @@ public static void IterateRows<T, TBuffer>(
         }
 
         int verticalStep = DivideCeil(height, numOfSteps);
-        var parallelOptions = new ParallelOptions { MaxDegreeOfParallelism = numOfSteps };
-        var wrappingOperation = new RowOperationWrapper<T, TBuffer>(top, bottom, verticalStep, bufferLength, allocator, in operation);
+        ParallelOptions parallelOptions = new() { MaxDegreeOfParallelism = numOfSteps };
+        RowOperationWrapper<T, TBuffer> wrappingOperation = new(top, bottom, verticalStep, bufferLength, allocator, in operation);
 
         Parallel.For(
             0,
@@ -156,7 +156,7 @@ public static void IterateRows<T, TBuffer>(
     public static void IterateRowIntervals<T>(Configuration configuration, Rectangle rectangle, in T operation)
         where T : struct, IRowIntervalOperation
     {
-        var parallelSettings = ParallelExecutionSettings.FromConfiguration(configuration);
+        ParallelExecutionSettings parallelSettings = ParallelExecutionSettings.FromConfiguration(configuration);
         IterateRowIntervals(rectangle, in parallelSettings, in operation);
     }
 
@@ -186,14 +186,14 @@ public static void IterateRowIntervals<T>(
         // Avoid TPL overhead in this trivial case:
         if (numOfSteps == 1)
         {
-            var rows = new RowInterval(top, bottom);
+            RowInterval rows = new(top, bottom);
             Unsafe.AsRef(in operation).Invoke(in rows);
             return;
         }
 
         int verticalStep = DivideCeil(rectangle.Height, numOfSteps);
-        var parallelOptions = new ParallelOptions { MaxDegreeOfParallelism = numOfSteps };
-        var wrappingOperation = new RowIntervalOperationWrapper<T>(top, bottom, verticalStep, in operation);
+        ParallelOptions parallelOptions = new() { MaxDegreeOfParallelism = numOfSteps };
+        RowIntervalOperationWrapper<T> wrappingOperation = new(top, bottom, verticalStep, in operation);
 
         Parallel.For(
             0,
@@ -215,7 +215,7 @@ public static void IterateRowIntervals<T, TBuffer>(Configuration configuration,
         where T : struct, IRowIntervalOperation<TBuffer>
         where TBuffer : unmanaged
     {
-        var parallelSettings = ParallelExecutionSettings.FromConfiguration(configuration);
+        ParallelExecutionSettings parallelSettings = ParallelExecutionSettings.FromConfiguration(configuration);
         IterateRowIntervals<T, TBuffer>(rectangle, in parallelSettings, in operation);
     }
 
@@ -250,7 +250,7 @@ public static void IterateRowIntervals<T, TBuffer>(
         // Avoid TPL overhead in this trivial case:
         if (numOfSteps == 1)
         {
-            var rows = new RowInterval(top, bottom);
+            RowInterval rows = new(top, bottom);
             using IMemoryOwner<TBuffer> buffer = allocator.Allocate<TBuffer>(bufferLength);
 
             Unsafe.AsRef(in operation).Invoke(in rows, buffer.Memory.Span);
@@ -259,8 +259,8 @@ public static void IterateRowIntervals<T, TBuffer>(
         }
 
         int verticalStep = DivideCeil(height, numOfSteps);
-        var parallelOptions = new ParallelOptions { MaxDegreeOfParallelism = numOfSteps };
-        var wrappingOperation = new RowIntervalOperationWrapper<T, TBuffer>(top, bottom, verticalStep, bufferLength, allocator, in operation);
+        ParallelOptions parallelOptions = new() { MaxDegreeOfParallelism = numOfSteps };
+        RowIntervalOperationWrapper<T, TBuffer> wrappingOperation = new(top, bottom, verticalStep, bufferLength, allocator, in operation);
 
         Parallel.For(
             0,

src/ImageSharp/Advanced/ParallelRowIterator.cs

@@ -8,7 +8,7 @@ namespace SixLabors.ImageSharp;
 /// </content>
 public partial struct Color
 {
-    private static readonly Lazy<Color[]> WebSafePaletteLazy = new Lazy<Color[]>(CreateWebSafePalette, true);
+    private static readonly Lazy<Color[]> WebSafePaletteLazy = new(CreateWebSafePalette, true);
 
     /// <summary>
     /// Gets a collection of named, web safe colors as defined in the CSS Color Module Level 4.

src/ImageSharp/Color/Color.WebSafePalette.cs

@@ -8,7 +8,7 @@ namespace SixLabors.ImageSharp;
 /// </content>
 public partial struct Color
 {
-    private static readonly Lazy<Color[]> WernerPaletteLazy = new Lazy<Color[]>(CreateWernerPalette, true);
+    private static readonly Lazy<Color[]> WernerPaletteLazy = new(CreateWernerPalette, true);
 
     /// <summary>
     /// Gets a collection of colors as defined in the original second edition of Werner’s Nomenclature of Colours 1821.

src/ImageSharp/Color/Color.WernerPalette.cs

@@ -81,10 +81,10 @@ public static Color FromPixel<TPixel>(TPixel source)
         PixelTypeInfo info = TPixel.GetPixelTypeInfo();
         if (info.ComponentInfo.HasValue && info.ComponentInfo.Value.GetMaximumComponentPrecision() <= (int)PixelComponentBitDepth.Bit32)
         {
-            return new(source.ToScaledVector4());
+            return new Color(source.ToScaledVector4());
         }
 
-        return new(source);
+        return new Color(source);
     }
 
     /// <summary>
@@ -120,7 +120,7 @@ public static void FromPixel<TPixel>(ReadOnlySpan<TPixel> source, Span<Color> de
         {
             for (int i = 0; i < destination.Length; i++)
             {
-                destination[i] = new(source[i]);
+                destination[i] = new Color(source[i]);
             }
         }
     }

src/ImageSharp/Color/Color.cs

@@ -182,7 +182,7 @@ public CieXyz ToProfileConnectingSpace(ColorConversionOptions options)
         Vector3 wxyz = new(whitePoint.X, whitePoint.Y, whitePoint.Z);
         Vector3 xyzr = new(xr, yr, zr);
 
-        return new(xyzr * wxyz);
+        return new CieXyz(xyzr * wxyz);
     }
 
     /// <inheritdoc/>

src/ImageSharp/ColorProfiles/CieLab.cs

@@ -12,7 +12,7 @@ public class ColorProfileConverter
     /// Initializes a new instance of the <see cref="ColorProfileConverter"/> class.
     /// </summary>
     public ColorProfileConverter()
-        : this(new())
+        : this(new ColorConversionOptions())
     {
     }
 

src/ImageSharp/ColorProfiles/ColorProfileConverter.cs

@@ -58,7 +58,7 @@ public Vector4 Calculate(Vector4 value)
             // when data to PCS, upstream process provides scaled XYZ
             // but input to calculator is descaled XYZ
             // (see DemoMaxICC IccCmm.cpp : CIccXformMatrixTRC::Apply)
-            xyz = new(CieXyz.FromScaledVector4(xyz).AsVector3Unsafe(), 1);
+            xyz = new Vector4(CieXyz.FromScaledVector4(xyz).AsVector3Unsafe(), 1);
             return this.curveCalculator.Calculate(xyz);
         }
     }