Use file scoped namespaces

src/ImageSharp/ColorSpaces/Conversion/Implementation/Icc/Calculators/CurveCalculator.CalculationType.cs

@@ -1,15 +1,14 @@
-// Copyright (c) Six Labors.
+// Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Icc
+namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Icc;
+
+internal partial class CurveCalculator
 {
-    internal partial class CurveCalculator
-    {
     private enum CalculationType
     {
         Identity,
         Gamma,
         Lut,
     }
-    }
 }

src/ImageSharp/ColorSpaces/Conversion/Implementation/Icc/Calculators/CurveCalculator.cs

@@ -1,13 +1,12 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-using System;
 using SixLabors.ImageSharp.Metadata.Profiles.Icc;
 
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Icc
+namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Icc;
+
+internal partial class CurveCalculator : ISingleCalculator
 {
-    internal partial class CurveCalculator : ISingleCalculator
-    {
     private LutCalculator lutCalculator;
     private float gamma;
     private CalculationType type;
@@ -52,5 +51,4 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Icc
                 throw new InvalidOperationException("Invalid calculation type");
         }
     }
-    }
 }

src/ImageSharp/ColorSpaces/Conversion/Implementation/Icc/Calculators/GrayTrcCalculator.cs

@@ -5,10 +5,10 @@ using System.Numerics;
 using System.Runtime.CompilerServices;
 using SixLabors.ImageSharp.Metadata.Profiles.Icc;
 
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Icc
+namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Icc;
+
+internal class GrayTrcCalculator : IVector4Calculator
 {
-    internal class GrayTrcCalculator : IVector4Calculator
-    {
     private TrcCalculator calculator;
 
     public GrayTrcCalculator(IccTagDataEntry grayTrc, bool toPcs)
@@ -21,5 +21,4 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Icc
     {
         return this.calculator.Calculate(value);
     }
-    }
 }

src/ImageSharp/ColorSpaces/Conversion/Implementation/Icc/Calculators/ISingleCalculator.cs

@@ -1,18 +1,17 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Icc
+namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Icc;
+
+/// <summary>
+/// Represents an ICC calculator with a single floating point value and result
+/// </summary>
+internal interface ISingleCalculator
 {
-    /// <summary>
-    /// Represents an ICC calculator with a single floating point value and result
-    /// </summary>
-    internal interface ISingleCalculator
-    {
     /// <summary>
     /// Calculates a result from the given value
     /// </summary>
     /// <param name="value">The input value</param>
     /// <returns>The calculated result</returns>
     float Calculate(float value);
-    }
 }

src/ImageSharp/ColorSpaces/Conversion/Implementation/Icc/Calculators/IVector4Calculator.cs

@@ -3,18 +3,17 @@
 
 using System.Numerics;
 
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Icc
+namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Icc;
+
+/// <summary>
+/// Represents an ICC calculator with <see cref="Vector4"/> values and results
+/// </summary>
+internal interface IVector4Calculator
 {
-    /// <summary>
-    /// Represents an ICC calculator with <see cref="Vector4"/> values and results
-    /// </summary>
-    internal interface IVector4Calculator
-    {
     /// <summary>
     /// Calculates a result from the given values
     /// </summary>
     /// <param name="value">The input values</param>
     /// <returns>The calculated result</returns>
     Vector4 Calculate(Vector4 value);
-    }
 }

src/ImageSharp/ColorSpaces/Conversion/Implementation/Icc/Calculators/LutABCalculator.CalculationType.cs

@@ -1,10 +1,10 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Icc
+namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Icc;
+
+internal partial class LutABCalculator
 {
-    internal partial class LutABCalculator
-    {
     private enum CalculationType
     {
         AtoB = 1 << 3,
@@ -15,5 +15,4 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Icc
         CurveClut = 3,
         Full = 4,
     }
-    }
 }

src/ImageSharp/ColorSpaces/Conversion/Implementation/Icc/Calculators/LutABCalculator.cs

@@ -5,10 +5,10 @@ using System;
 using System.Numerics;
 using SixLabors.ImageSharp.Metadata.Profiles.Icc;
 
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Icc
+namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Icc;
+
+internal partial class LutABCalculator : IVector4Calculator
 {
-    internal partial class LutABCalculator : IVector4Calculator
-    {
     private CalculationType type;
     private TrcCalculator curveACalculator;
     private TrcCalculator curveBCalculator;
@@ -131,5 +131,4 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Icc
             this.clutCalculator = new ClutCalculator(clut);
         }
     }
-    }
 }

src/ImageSharp/ColorSpaces/Conversion/Implementation/Icc/Calculators/LutCalculator.cs

@@ -4,10 +4,10 @@
 using System;
 using System.Runtime.CompilerServices;
 
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Icc
+namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Icc;
+
+internal class LutCalculator : ISingleCalculator
 {
-    internal class LutCalculator : ISingleCalculator
-    {
     private float[] lut;
     private bool inverse;
 
@@ -69,5 +69,4 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Icc
 
         return lutLow + (valuePercent * lutRange);
     }
-    }
 }

src/ImageSharp/ColorSpaces/Conversion/Implementation/Icc/Calculators/LutEntryCalculator.cs

@@ -4,10 +4,10 @@
 using System.Numerics;
 using SixLabors.ImageSharp.Metadata.Profiles.Icc;
 
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Icc
+namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Icc;
+
+internal class LutEntryCalculator : IVector4Calculator
 {
-    internal class LutEntryCalculator : IVector4Calculator
-    {
     private LutCalculator[] inputCurve;
     private LutCalculator[] outputCurve;
     private ClutCalculator clutCalculator;
@@ -71,5 +71,4 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Icc
 
         return calculators;
     }
-    }
 }

src/ImageSharp/ColorSpaces/Conversion/Implementation/Icc/Calculators/MatrixCalculator.cs

@@ -4,10 +4,10 @@
 using System.Numerics;
 using System.Runtime.CompilerServices;
 
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Icc
+namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Icc;
+
+internal class MatrixCalculator : IVector4Calculator
 {
-    internal class MatrixCalculator : IVector4Calculator
-    {
     private Matrix4x4 matrix2D;
     private Vector4 matrix1D;
 
@@ -23,5 +23,4 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Icc
         var transformed = Vector4.Transform(value, this.matrix2D);
         return Vector4.Add(this.matrix1D, transformed);
     }
-    }
 }

src/ImageSharp/ColorSpaces/Conversion/Implementation/Icc/Calculators/ParametricCurveCalculator.cs

@@ -5,10 +5,10 @@ using System;
 using System.Runtime.CompilerServices;
 using SixLabors.ImageSharp.Metadata.Profiles.Icc;
 
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Icc
+namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Icc;
+
+internal class ParametricCurveCalculator : ISingleCalculator
 {
-    internal class ParametricCurveCalculator : ISingleCalculator
-    {
     private IccParametricCurve curve;
     private IccParametricCurveType type;
     private const IccParametricCurveType InvertedFlag = (IccParametricCurveType)(1 << 3);
@@ -164,5 +164,4 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Icc
             return (value - this.curve.F) / this.curve.C;
         }
     }
-    }
 }

src/ImageSharp/ColorSpaces/Conversion/Implementation/Icc/Calculators/TrcCalculator.cs

@@ -4,10 +4,10 @@
 using System.Numerics;
 using SixLabors.ImageSharp.Metadata.Profiles.Icc;
 
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Icc
+namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Icc;
+
+internal class TrcCalculator : IVector4Calculator
 {
-    internal class TrcCalculator : IVector4Calculator
-    {
     private ISingleCalculator[] calculators;
 
     public TrcCalculator(IccTagDataEntry[] entries, bool inverted)
@@ -43,5 +43,4 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Icc
 
         return value;
     }
-    }
 }

src/ImageSharp/ColorSpaces/Conversion/Implementation/Icc/IccConverterBase.ConversionMethod.cs

@@ -1,13 +1,13 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Icc
+namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Icc;
+
+/// <summary>
+/// Color converter for ICC profiles
+/// </summary>
+internal abstract partial class IccConverterBase
 {
-    /// <summary>
-    /// Color converter for ICC profiles
-    /// </summary>
-    internal abstract partial class IccConverterBase
-    {
     /// <summary>
     /// Conversion methods with ICC profiles
     /// </summary>
@@ -63,5 +63,4 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Icc
         /// </summary>
         Invalid,
     }
-    }
 }

src/ImageSharp/ColorSpaces/Conversion/Implementation/Icc/IccConverterbase.Conversions.cs

@@ -5,13 +5,13 @@ using System;
 using SixLabors.ImageSharp.ColorSpaces.Conversion.Icc;
 using SixLabors.ImageSharp.Metadata.Profiles.Icc;
 
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Icc
+namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Icc;
+
+/// <summary>
+/// Color converter for ICC profiles
+/// </summary>
+internal abstract partial class IccConverterBase
 {
-    /// <summary>
-    /// Color converter for ICC profiles
-    /// </summary>
-    internal abstract partial class IccConverterBase
-    {
     private IVector4Calculator calculator;
 
     /// <summary>
@@ -146,5 +146,4 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Icc
         IccTagDataEntry entry = GetTag(profile, IccProfileTag.GrayTrc);
         return new GrayTrcCalculator(entry, toPcs);
     }
-    }
 }

src/ImageSharp/ColorSpaces/Conversion/Implementation/Icc/IccConverterbase.cs

@@ -5,13 +5,13 @@ using System.Numerics;
 using System.Runtime.CompilerServices;
 using SixLabors.ImageSharp.Metadata.Profiles.Icc;
 
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Icc
+namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Icc;
+
+/// <summary>
+/// Color converter for ICC profiles
+/// </summary>
+internal abstract partial class IccConverterBase
 {
-    /// <summary>
-    /// Color converter for ICC profiles
-    /// </summary>
-    internal abstract partial class IccConverterBase
-    {
     /// <summary>
     /// Initializes a new instance of the <see cref="IccConverterBase"/> class.
     /// </summary>
@@ -33,5 +33,4 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Icc
     {
         return this.calculator.Calculate(value);
     }
-    }
 }

src/ImageSharp/ColorSpaces/Conversion/Implementation/Icc/IccDataToDataConverter.cs

@@ -3,13 +3,13 @@
 
 using SixLabors.ImageSharp.Metadata.Profiles.Icc;
 
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Icc
+namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Icc;
+
+/// <summary>
+/// Color converter for ICC profiles
+/// </summary>
+internal class IccDataToDataConverter : IccConverterBase
 {
-    /// <summary>
-    /// Color converter for ICC profiles
-    /// </summary>
-    internal class IccDataToDataConverter : IccConverterBase
-    {
     /// <summary>
     /// Initializes a new instance of the <see cref="IccDataToDataConverter"/> class.
     /// </summary>
@@ -18,5 +18,4 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Icc
         : base(profile, true) // toPCS is true because in this case the PCS space is also a data space
     {
     }
-    }
 }

src/ImageSharp/ColorSpaces/Conversion/Implementation/Icc/IccDataToPcsConverter.cs

@@ -3,13 +3,13 @@
 
 using SixLabors.ImageSharp.Metadata.Profiles.Icc;
 
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Icc
+namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Icc;
+
+/// <summary>
+/// Color converter for ICC profiles
+/// </summary>
+internal class IccDataToPcsConverter : IccConverterBase
 {
-    /// <summary>
-    /// Color converter for ICC profiles
-    /// </summary>
-    internal class IccDataToPcsConverter : IccConverterBase
-    {
     /// <summary>
     /// Initializes a new instance of the <see cref="IccDataToPcsConverter"/> class.
     /// </summary>
@@ -18,5 +18,4 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Icc
         : base(profile, true)
     {
     }
-    }
 }

src/ImageSharp/ColorSpaces/Conversion/Implementation/Icc/IccPcsToDataConverter.cs

@@ -3,13 +3,13 @@
 
 using SixLabors.ImageSharp.Metadata.Profiles.Icc;
 
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Icc
+namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Icc;
+
+/// <summary>
+/// Color converter for ICC profiles
+/// </summary>
+internal class IccPcsToDataConverter : IccConverterBase
 {
-    /// <summary>
-    /// Color converter for ICC profiles
-    /// </summary>
-    internal class IccPcsToDataConverter : IccConverterBase
-    {
     /// <summary>
     /// Initializes a new instance of the <see cref="IccPcsToDataConverter"/> class.
     /// </summary>
@@ -18,5 +18,4 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Icc
         : base(profile, false)
     {
     }
-    }
 }

src/ImageSharp/ColorSpaces/Conversion/Implementation/Icc/IccPcsToPcsConverter.cs

@@ -3,13 +3,13 @@
 
 using SixLabors.ImageSharp.Metadata.Profiles.Icc;
 
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Icc
+namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Icc;
+
+/// <summary>
+/// Color converter for ICC profiles
+/// </summary>
+internal class IccPcsToPcsConverter : IccConverterBase
 {
-    /// <summary>
-    /// Color converter for ICC profiles
-    /// </summary>
-    internal class IccPcsToPcsConverter : IccConverterBase
-    {
     /// <summary>
     /// Initializes a new instance of the <see cref="IccPcsToPcsConverter"/> class.
     /// </summary>
@@ -18,5 +18,4 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Icc
         : base(profile, true)
     {
     }
-    }
 }