Merge branch 'main' into bp/arithmeticcoding

src/ImageSharp/Metadata/Profiles/Exif/ExifProfile.cs

@@ -121,6 +121,14 @@ namespace SixLabors.ImageSharp.Metadata.Profiles.Exif
             }
         }
 
+        /// <summary>
+        /// Returns the thumbnail in the EXIF profile when available.
+        /// </summary>
+        /// <returns>
+        /// The <see cref="Image"/>.
+        /// </returns>
+        public Image CreateThumbnail() => this.CreateThumbnail<Rgba32>();
+
         /// <summary>
         /// Returns the thumbnail in the EXIF profile when available.
         /// </summary>

src/ImageSharp/Metadata/Profiles/Exif/ExifReader.cs

@@ -202,7 +202,7 @@ namespace SixLabors.ImageSharp.Metadata.Profiles.Exif
 
         protected void ReadValues64(List<IExifValue> values, ulong offset)
         {
-            DebugGuard.MustBeLessThanOrEqualTo(offset, (ulong)this.data.Length, "By spec UInt64.MaxValue is supported, but .Net Stream.Length can Int64.MaxValue.");
+            DebugGuard.MustBeLessThanOrEqualTo(offset, (ulong)this.data.Length, "By spec UInt64.MaxValue is supported, but .NET Stream.Length can Int64.MaxValue.");
 
             this.Seek(offset);
             ulong count = this.ReadUInt64();

src/ImageSharp/Processing/Processors/Transforms/Linear/AffineTransformProcessor{TPixel}.cs

@@ -187,12 +187,12 @@ namespace SixLabors.ImageSharp.Processing.Processors.Transforms
                     && RuntimeEnvironment.IsNetCore)
                 {
                     // There's something wrong with the JIT in .NET Core 3.1 on certain
-                    // MacOSX machines so we have to use different pipelines.
+                    // macOS machines so we have to use different pipelines.
                     // It's:
                     // - Not reproducable locally
                     // - Doesn't seem to be triggered by the bulk Numerics.UnPremultiply method but by caller.
                     // https://github.com/SixLabors/ImageSharp/pull/1591
-                    this.InvokeMacOSX(in rows, span);
+                    this.InvokeMacOS(in rows, span);
                     return;
                 }
 
@@ -259,7 +259,7 @@ namespace SixLabors.ImageSharp.Processing.Processors.Transforms
 
             [ExcludeFromCodeCoverage]
             [MethodImpl(InliningOptions.ShortMethod)]
-            private void InvokeMacOSX(in RowInterval rows, Span<Vector4> span)
+            private void InvokeMacOS(in RowInterval rows, Span<Vector4> span)
             {
                 Matrix3x2 matrix = this.matrix;
                 TResampler sampler = this.sampler;

src/ImageSharp/Processing/Processors/Transforms/Linear/ProjectiveTransformProcessor{TPixel}.cs

@@ -186,12 +186,12 @@ namespace SixLabors.ImageSharp.Processing.Processors.Transforms
                     && RuntimeEnvironment.IsNetCore)
                 {
                     // There's something wrong with the JIT in .NET Core 3.1 on certain
-                    // MacOSX machines so we have to use different pipelines.
+                    // macOS machines so we have to use different pipelines.
                     // It's:
                     // - Not reproducable locally
                     // - Doesn't seem to be triggered by the bulk Numerics.UnPremultiply method but by caller.
                     // https://github.com/SixLabors/ImageSharp/pull/1591
-                    this.InvokeMacOSX(in rows, span);
+                    this.InvokeMacOS(in rows, span);
                     return;
                 }
 
@@ -258,7 +258,7 @@ namespace SixLabors.ImageSharp.Processing.Processors.Transforms
 
             [ExcludeFromCodeCoverage]
             [MethodImpl(InliningOptions.ShortMethod)]
-            public void InvokeMacOSX(in RowInterval rows, Span<Vector4> span)
+            public void InvokeMacOS(in RowInterval rows, Span<Vector4> span)
             {
                 Matrix4x4 matrix = this.matrix;
                 TResampler sampler = this.sampler;

tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderTests.cs

@@ -192,7 +192,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Tiff
         public void TiffDecoder_CanDecode_12Bit_WithAssociatedAlpha<TPixel>(TestImageProvider<TPixel> provider)
             where TPixel : unmanaged, IPixel<TPixel>
         {
-            if (TestEnvironment.IsOSX)
+            if (TestEnvironment.IsMacOS)
             {
                 // Only debug save on OSX: For some reason the reference image has a difference of 50%. The imagesharp output file looks ok though.
                 using Image<TPixel> image = provider.GetImage(TiffDecoder);
@@ -249,7 +249,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Tiff
 
             where TPixel : unmanaged, IPixel<TPixel>
         {
-            if (TestEnvironment.IsOSX)
+            if (TestEnvironment.IsMacOS)
             {
                 // Only debug save on OSX: For some reason the reference image has a difference of 50%. The imagesharp output file looks ok though.
                 using Image<TPixel> image = provider.GetImage(TiffDecoder);
@@ -276,7 +276,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Tiff
         public void TiffDecoder_CanDecode_24Bit_WithAssociatedAlpha<TPixel>(TestImageProvider<TPixel> provider)
             where TPixel : unmanaged, IPixel<TPixel>
         {
-            if (TestEnvironment.IsOSX)
+            if (TestEnvironment.IsMacOS)
             {
                 // Only debug save on OSX: For some reason the reference image has a difference of 50%. The imagesharp output file looks ok though.
                 using Image<TPixel> image = provider.GetImage(TiffDecoder);
@@ -313,7 +313,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Tiff
             where TPixel : unmanaged, IPixel<TPixel>
         {
             // Note: The image from MagickReferenceDecoder does not look right, maybe we are doing something wrong
-            // converting the pixel data from Magick.Net to our format with YCbCr?
+            // converting the pixel data from Magick.NET to our format with YCbCr?
             using Image<TPixel> image = provider.GetImage();
             image.DebugSave(provider);
         }
@@ -353,7 +353,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Tiff
         public void TiffDecoder_CanDecode_32Bit_WithAssociatedAlpha<TPixel>(TestImageProvider<TPixel> provider)
             where TPixel : unmanaged, IPixel<TPixel>
         {
-            if (TestEnvironment.IsOSX)
+            if (TestEnvironment.IsMacOS)
             {
                 // Only debug save on OSX: For some reason the reference image has a difference of 50%. The imagesharp output file looks ok though.
                 using Image<TPixel> image = provider.GetImage(TiffDecoder);
@@ -393,7 +393,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Tiff
         public void TiffDecoder_CanDecode_40Bit_WithAssociatedAlpha<TPixel>(TestImageProvider<TPixel> provider)
             where TPixel : unmanaged, IPixel<TPixel>
         {
-            if (TestEnvironment.IsOSX)
+            if (TestEnvironment.IsMacOS)
             {
                 // Only debug save on OSX: For some reason the reference image has a difference of 50%. The imagesharp output file looks ok though.
                 using Image<TPixel> image = provider.GetImage(TiffDecoder);
@@ -432,7 +432,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Tiff
         public void TiffDecoder_CanDecode_48Bit_WithAssociatedAlpha<TPixel>(TestImageProvider<TPixel> provider)
             where TPixel : unmanaged, IPixel<TPixel>
         {
-            if (TestEnvironment.IsOSX)
+            if (TestEnvironment.IsMacOS)
             {
                 // Only debug save on OSX: For some reason the reference image has a difference of 50%. The imagesharp output file looks ok though.
                 using Image<TPixel> image = provider.GetImage(TiffDecoder);
@@ -462,7 +462,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Tiff
         public void TiffDecoder_CanDecode_56Bit_WithAssociatedAlpha<TPixel>(TestImageProvider<TPixel> provider)
             where TPixel : unmanaged, IPixel<TPixel>
         {
-            if (TestEnvironment.IsOSX)
+            if (TestEnvironment.IsMacOS)
             {
                 // Only debug save on OSX: For some reason the reference image has a difference of 50%. The imagesharp output file looks ok though.
                 using Image<TPixel> image = provider.GetImage(TiffDecoder);

tests/ImageSharp.Tests/Helpers/RuntimeEnvironmentTests.cs

@@ -28,7 +28,7 @@ namespace SixLabors.ImageSharp.Tests.Helpers
             {
                 Assert.True(RuntimeEnvironment.IsOSPlatform(OSPlatform.Linux));
             }
-            else if (TestEnvironment.IsOSX)
+            else if (TestEnvironment.IsMacOS)
             {
                 Assert.True(RuntimeEnvironment.IsOSPlatform(OSPlatform.OSX));
             }

tests/ImageSharp.Tests/Memory/Allocators/UniformUnmanagedMemoryPoolTests.Trim.cs

@@ -58,11 +58,11 @@ namespace SixLabors.ImageSharp.Tests.Memory.Allocators
             [Collection(nameof(NonParallelCollection))]
             public class NonParallel
             {
-                public static readonly bool IsNotMacOs = !TestEnvironment.IsOSX;
+                public static readonly bool IsNotMacOS = !TestEnvironment.IsMacOS;
 
-                // TODO: Investigate failures on MacOS. All handles are released after GC.
+                // TODO: Investigate failures on macOS. All handles are released after GC.
                 // (It seems to happen more consistently on .NET 6.)
-                [ConditionalFact(nameof(IsNotMacOs))]
+                [ConditionalFact(nameof(IsNotMacOS))]
                 public void MultiplePoolInstances_TrimPeriodElapsed_AllAreTrimmed()
                 {
                     if (!TestEnvironment.RunsOnCI)

tests/ImageSharp.Tests/Memory/Allocators/UniformUnmanagedMemoryPoolTests.cs

@@ -245,9 +245,9 @@ namespace SixLabors.ImageSharp.Tests.Memory.Allocators
             cleanup.Register(b1);
         }
 
-        public static readonly bool IsNotMacOS = !TestEnvironment.IsOSX;
+        public static readonly bool IsNotMacOS = !TestEnvironment.IsMacOS;
 
-        // TODO: Investigate MacOS failures
+        // TODO: Investigate macOS failures
         [ConditionalTheory(nameof(IsNotMacOS))]
         [InlineData(false)]
         [InlineData(true)]

tests/ImageSharp.Tests/Memory/Allocators/UniformUnmanagedPoolMemoryAllocatorTests.cs

@@ -259,9 +259,9 @@ namespace SixLabors.ImageSharp.Tests.Memory.Allocators
         [InlineData(1200)] // Group of two UniformUnmanagedMemoryPool buffers
         public void AllocateMemoryGroup_Finalization_ReturnsToPool(int length)
         {
-            if (TestEnvironment.IsOSX)
+            if (TestEnvironment.IsMacOS)
             {
-                // Skip on OSX: https://github.com/SixLabors/ImageSharp/issues/1887
+                // Skip on macOS: https://github.com/SixLabors/ImageSharp/issues/1887
                 return;
             }
 
@@ -321,9 +321,9 @@ namespace SixLabors.ImageSharp.Tests.Memory.Allocators
         [InlineData(600)] // Group of single UniformUnmanagedMemoryPool buffer
         public void AllocateSingleMemoryOwner_Finalization_ReturnsToPool(int length)
         {
-            if (TestEnvironment.IsOSX)
+            if (TestEnvironment.IsMacOS)
             {
-                // Skip on OSX: https://github.com/SixLabors/ImageSharp/issues/1887
+                // Skip on macOS: https://github.com/SixLabors/ImageSharp/issues/1887
                 return;
             }
 

tests/ImageSharp.Tests/Metadata/Profiles/Exif/ExifProfileTests.cs

@@ -354,10 +354,15 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.Exif
 
             TestProfile(profile);
 
-            using Image<Rgba32> thumbnail = profile.CreateThumbnail<Rgba32>();
+            using Image thumbnail = profile.CreateThumbnail();
             Assert.NotNull(thumbnail);
             Assert.Equal(256, thumbnail.Width);
             Assert.Equal(170, thumbnail.Height);
+
+            using Image<Rgba32> genericThumbnail = profile.CreateThumbnail<Rgba32>();
+            Assert.NotNull(genericThumbnail);
+            Assert.Equal(256, genericThumbnail.Width);
+            Assert.Equal(170, genericThumbnail.Height);
         }
 
         [Fact]

tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeTests.cs

@@ -34,7 +34,7 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Transforms
             };
 
         private static readonly ImageComparer ValidatorComparer =
-            ImageComparer.TolerantPercentage(TestEnvironment.IsOSX && TestEnvironment.RunsOnCI ? 0.26F : 0.07F);
+            ImageComparer.TolerantPercentage(TestEnvironment.IsMacOS && TestEnvironment.RunsOnCI ? 0.26F : 0.07F);
 
         [Fact]
         public void Resize_PixelAgnostic()

tests/ImageSharp.Tests/TestUtilities/ImageComparison/Exceptions/ImageDifferenceIsOverThresholdException.cs

@@ -24,7 +24,7 @@ namespace SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison
 
             sb.Append(Environment.NewLine);
 
-            // TODO: We should add OSX.
+            // TODO: We should add macOS.
             sb.AppendFormat("Test Environment OS : {0}", TestEnvironment.IsWindows ? "Windows" : "Linux");
             sb.Append(Environment.NewLine);
 

tests/ImageSharp.Tests/TestUtilities/TestEnvironment.cs

@@ -110,7 +110,7 @@ namespace SixLabors.ImageSharp.Tests
 
         internal static bool IsLinux => RuntimeInformation.IsOSPlatform(OSPlatform.Linux);
 
-        internal static bool IsOSX => RuntimeInformation.IsOSPlatform(OSPlatform.OSX);
+        internal static bool IsMacOS => RuntimeInformation.IsOSPlatform(OSPlatform.OSX);
 
         internal static bool IsMono => Type.GetType("Mono.Runtime") != null; // https://stackoverflow.com/a/721194