diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index e00757cb7..99ca63fc3 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -62,30 +62,34 @@ jobs:
     needs: WarmLFS
     strategy:
       matrix:
-        isARM:
-          - ${{ contains(github.event.pull_request.labels.*.name, 'arch:arm32') || contains(github.event.pull_request.labels.*.name, 'arch:arm64') }}
         options:
           - os: ubuntu-latest
-            framework: net9.0
-            sdk: 9.0.x
+            framework: net10.0
+            sdk: 10.0.x
             sdk-preview: true
             runtime: -x64
             codecov: false
           - os: macos-13 # macos-latest runs on arm64 runners where libgdiplus is unavailable
-            framework: net9.0
-            sdk: 9.0.x
+            framework: net10.0
+            sdk: 10.0.x
+            sdk-preview: true
+            runtime: -x64
+            codecov: false
+          - os: macos-26
+            framework: net10.0
+            sdk: 10.0.x
             sdk-preview: true
             runtime: -x64
             codecov: false
           - os: windows-latest
-            framework: net9.0
-            sdk: 9.0.x
+            framework: net10.0
+            sdk: 10.0.x
             sdk-preview: true
             runtime: -x64
             codecov: false
-          - os: buildjet-4vcpu-ubuntu-2204-arm
-            framework: net9.0
-            sdk: 9.0.x
+          - os: ubuntu-22.04-arm
+            framework: net10.0
+            sdk: 10.0.x
             sdk-preview: true
             runtime: -x64
             codecov: false
@@ -100,20 +104,21 @@ jobs:
             sdk: 8.0.x
             runtime: -x64
             codecov: false
+          - os: macos-26
+            framework: net8.0
+            sdk: 8.0.x
+            runtime: -x64
+            codecov: false
           - os: windows-latest
             framework: net8.0
             sdk: 8.0.x
             runtime: -x64
             codecov: false
-          - os: buildjet-4vcpu-ubuntu-2204-arm
+          - os: ubuntu-22.04-arm
             framework: net8.0
             sdk: 8.0.x
             runtime: -x64
             codecov: false
-        exclude:
-          - isARM: false
-            options:
-              os: buildjet-4vcpu-ubuntu-2204-arm
 
     runs-on: ${{ matrix.options.os }}
 
@@ -124,6 +129,18 @@ jobs:
           sudo apt-get update
           sudo apt-get -y install libgdiplus libgif-dev libglib2.0-dev libcairo2-dev libtiff-dev libexif-dev
 
+      - name: Install libgdi+, which is required for tests running on macos
+        if: ${{ contains(matrix.options.os, 'macos-26') }}
+        run: |
+          brew update
+          brew install mono-libgdiplus
+          # Create symlinks to make libgdiplus discoverable
+          sudo mkdir -p /usr/local/lib
+          sudo ln -sf $(brew --prefix)/lib/libgdiplus.dylib /usr/local/lib/libgdiplus.dylib
+          # Verify installation
+          ls -la $(brew --prefix)/lib/libgdiplus* || echo "libgdiplus not found in brew prefix"
+          ls -la /usr/local/lib/libgdiplus* || echo "libgdiplus not found in /usr/local/lib"
+
       - name: Git Config
         shell: bash
         run: |
@@ -170,7 +187,7 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
-            9.0.x
+            10.0.x
 
       - name: DotNet Build
         if: ${{ matrix.options.sdk-preview != true }}
diff --git a/Directory.Build.props b/Directory.Build.props
index 755cbe3b3..9bda76f88 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -21,10 +21,14 @@
   <!-- Import the shared global .props file -->
   <Import Project="$(MSBuildThisFileDirectory)shared-infrastructure\msbuild\props\SixLabors.Global.props" />
 
-  <PropertyGroup>
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net8.0' OR '$(TargetFramework)' == 'net9.0'">
     <LangVersion>12.0</LangVersion>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net10.0'">
+    <LangVersion>14.0</LangVersion>
+  </PropertyGroup>
+
   <!--
   Ensure all custom build configurations based upon "Release" are optimized.
   This is easier than setting each project individually.
diff --git a/src/ImageSharp/Formats/Jpeg/JpegDecoderCore.cs b/src/ImageSharp/Formats/Jpeg/JpegDecoderCore.cs
index 0ad78b903..7825955e7 100644
--- a/src/ImageSharp/Formats/Jpeg/JpegDecoderCore.cs
+++ b/src/ImageSharp/Formats/Jpeg/JpegDecoderCore.cs
@@ -71,6 +71,11 @@ internal sealed class JpegDecoderCore : ImageDecoderCore, IRawJpegData
     /// </summary>
     private bool hasAdobeMarker;
 
+    /// <summary>
+    /// Whether the image has a SOS marker.
+    /// </summary>
+    private bool hasSOSMarker;
+
     /// <summary>
     /// Contains information about the JFIF marker.
     /// </summary>
@@ -197,6 +202,12 @@ internal sealed class JpegDecoderCore : ImageDecoderCore, IRawJpegData
     {
         using SpectralConverter<TPixel> spectralConverter = new(this.configuration, this.resizeMode == JpegDecoderResizeMode.ScaleOnly ? null : this.Options.TargetSize);
         this.ParseStream(stream, spectralConverter, cancellationToken);
+
+        if (!this.hasSOSMarker)
+        {
+            JpegThrowHelper.ThrowInvalidImageContentException("Missing SOS marker.");
+        }
+
         this.InitExifProfile();
         this.InitIccProfile();
         this.InitIptcProfile();
@@ -215,6 +226,12 @@ internal sealed class JpegDecoderCore : ImageDecoderCore, IRawJpegData
     protected override ImageInfo Identify(BufferedReadStream stream, CancellationToken cancellationToken)
     {
         this.ParseStream(stream, spectralConverter: null, cancellationToken);
+
+        if (!this.hasSOSMarker)
+        {
+            JpegThrowHelper.ThrowInvalidImageContentException("Missing SOS marker.");
+        }
+
         this.InitExifProfile();
         this.InitIccProfile();
         this.InitIptcProfile();
@@ -403,6 +420,8 @@ internal sealed class JpegDecoderCore : ImageDecoderCore, IRawJpegData
                         break;
 
                     case JpegConstants.Markers.SOS:
+
+                        this.hasSOSMarker = true;
                         if (!metadataOnly)
                         {
                             this.ProcessStartOfScanMarker(stream, markerContentByteSize);
diff --git a/src/ImageSharp/Formats/Webp/WebpAnimationDecoder.cs b/src/ImageSharp/Formats/Webp/WebpAnimationDecoder.cs
index 86489cd36..a23705413 100644
--- a/src/ImageSharp/Formats/Webp/WebpAnimationDecoder.cs
+++ b/src/ImageSharp/Formats/Webp/WebpAnimationDecoder.cs
@@ -112,12 +112,12 @@ internal class WebpAnimationDecoder : IDisposable
         this.webpMetadata = this.metadata.GetWebpMetadata();
         this.webpMetadata.RepeatCount = features.AnimationLoopCount;
 
-        Color backgroundColor = this.backgroundColorHandling == BackgroundColorHandling.Ignore
+        this.webpMetadata.BackgroundColor = this.backgroundColorHandling == BackgroundColorHandling.Ignore
             ? Color.Transparent
             : features.AnimationBackgroundColor!.Value;
 
-        this.webpMetadata.BackgroundColor = backgroundColor;
-
+        bool ignoreMetadata = this.skipMetadata;
+        SegmentIntegrityHandling segmentIntegrityHandling = this.segmentIntegrityHandling;
         Span<byte> buffer = stackalloc byte[4];
         uint frameCount = 0;
         int remainingBytes = (int)completeDataSize;
@@ -135,9 +135,16 @@ internal class WebpAnimationDecoder : IDisposable
 
                     remainingBytes -= (int)dataSize;
                     break;
+                case WebpChunkType.Iccp:
                 case WebpChunkType.Xmp:
                 case WebpChunkType.Exif:
-                    WebpChunkParsingUtils.ParseOptionalChunks(stream, chunkType, this.metadata, this.skipMetadata, this.segmentIntegrityHandling, buffer);
+                    WebpChunkParsingUtils.ParseOptionalChunks(
+                        stream,
+                        chunkType,
+                        this.metadata,
+                        ignoreMetadata,
+                        segmentIntegrityHandling,
+                        buffer);
                     break;
                 default:
 
@@ -187,9 +194,12 @@ internal class WebpAnimationDecoder : IDisposable
         this.webpMetadata.BackgroundColor = backgroundColor;
         TPixel backgroundPixel = backgroundColor.ToPixel<TPixel>();
 
+        bool ignoreMetadata = this.skipMetadata;
+        SegmentIntegrityHandling segmentIntegrityHandling = this.segmentIntegrityHandling;
         Span<byte> buffer = stackalloc byte[4];
         uint frameCount = 0;
         int remainingBytes = (int)completeDataSize;
+
         while (remainingBytes > 0)
         {
             WebpChunkType chunkType = WebpChunkParsingUtils.ReadChunkType(stream, buffer);
@@ -209,9 +219,10 @@ internal class WebpAnimationDecoder : IDisposable
 
                     remainingBytes -= (int)dataSize;
                     break;
+                case WebpChunkType.Iccp:
                 case WebpChunkType.Xmp:
                 case WebpChunkType.Exif:
-                    WebpChunkParsingUtils.ParseOptionalChunks(stream, chunkType, image!.Metadata, this.skipMetadata, this.segmentIntegrityHandling, buffer);
+                    WebpChunkParsingUtils.ParseOptionalChunks(stream, chunkType, image!.Metadata, ignoreMetadata, segmentIntegrityHandling, buffer);
                     break;
                 default:
 
diff --git a/src/ImageSharp/Formats/Webp/WebpChunkParsingUtils.cs b/src/ImageSharp/Formats/Webp/WebpChunkParsingUtils.cs
index dc95ca044..26ae28fd4 100644
--- a/src/ImageSharp/Formats/Webp/WebpChunkParsingUtils.cs
+++ b/src/ImageSharp/Formats/Webp/WebpChunkParsingUtils.cs
@@ -9,6 +9,7 @@ using SixLabors.ImageSharp.IO;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.Metadata;
 using SixLabors.ImageSharp.Metadata.Profiles.Exif;
+using SixLabors.ImageSharp.Metadata.Profiles.Icc;
 using SixLabors.ImageSharp.Metadata.Profiles.Xmp;
 
 namespace SixLabors.ImageSharp.Formats.Webp;
@@ -258,6 +259,9 @@ internal static class WebpChunkParsingUtils
     /// <param name="stream">The stream to read from.</param>
     /// <param name="buffer">The buffer to store the read data into.</param>
     /// <returns>A unsigned 24 bit integer.</returns>
+    /// <exception cref="ImageFormatException">
+    /// Thrown if the input stream is not valid.
+    /// </exception>
     public static uint ReadUInt24LittleEndian(Stream stream, Span<byte> buffer)
     {
         if (stream.Read(buffer, 0, 3) == 3)
@@ -272,8 +276,11 @@ internal static class WebpChunkParsingUtils
     /// <summary>
     /// Writes a unsigned 24 bit integer.
     /// </summary>
-    /// <param name="stream">The stream to read from.</param>
+    /// <param name="stream">The stream to write to.</param>
     /// <param name="data">The uint24 data to write.</param>
+    /// <exception cref="InvalidDataException">
+    /// Thrown if the data is not a valid unsigned 24 bit integer.
+    /// </exception>
     public static unsafe void WriteUInt24LittleEndian(Stream stream, uint data)
     {
         if (data >= 1 << 24)
@@ -296,18 +303,24 @@ internal static class WebpChunkParsingUtils
     /// </summary>
     /// <param name="stream">The stream to read the data from.</param>
     /// <param name="buffer">Buffer to store the data read from the stream.</param>
+    /// <param name="required">If true, the chunk size is required to be read, otherwise it can be skipped.</param>
     /// <returns>The chunk size in bytes.</returns>
-    public static uint ReadChunkSize(Stream stream, Span<byte> buffer)
+    /// <exception cref="ImageFormatException">Thrown if the input stream is not valid.</exception>
+    public static uint ReadChunkSize(Stream stream, Span<byte> buffer, bool required = true)
     {
-        DebugGuard.IsTrue(buffer.Length is 4, "buffer has wrong length");
-
         if (stream.Read(buffer) is 4)
         {
             uint chunkSize = BinaryPrimitives.ReadUInt32LittleEndian(buffer);
             return chunkSize % 2 is 0 ? chunkSize : chunkSize + 1;
         }
 
-        throw new ImageFormatException("Invalid Webp data, could not read chunk size.");
+        if (required)
+        {
+            throw new ImageFormatException("Invalid Webp data, could not read chunk size.");
+        }
+
+        // Return the size of the remaining data in the stream.
+        return (uint)(stream.Length - stream.Position);
     }
 
     /// <summary>
@@ -320,14 +333,13 @@ internal static class WebpChunkParsingUtils
     /// </exception>
     public static WebpChunkType ReadChunkType(BufferedReadStream stream, Span<byte> buffer)
     {
-        DebugGuard.IsTrue(buffer.Length == 4, "buffer has wrong length");
-
         if (stream.Read(buffer) == 4)
         {
-            WebpChunkType chunkType = (WebpChunkType)BinaryPrimitives.ReadUInt32BigEndian(buffer);
-            return chunkType;
+            return (WebpChunkType)BinaryPrimitives.ReadUInt32BigEndian(buffer);
         }
 
+        // While we ignore unknown chunks we still need a to be a ble to read a chunk type
+        // known or otherwise from the stream.
         throw new ImageFormatException("Invalid Webp data, could not read chunk type.");
     }
 
@@ -336,82 +348,182 @@ internal static class WebpChunkParsingUtils
     /// If there are more such chunks, readers MAY ignore all except the first one.
     /// Also, a file may possibly contain both 'EXIF' and 'XMP ' chunks.
     /// </summary>
+    /// <param name="stream">The stream to read the data from.</param>
+    /// <param name="chunkType">The chunk type to parse.</param>
+    /// <param name="metadata">The image metadata to write to.</param>
+    /// <param name="ignoreMetadata">If true, metadata will be ignored.</param>
+    /// <param name="segmentIntegrityHandling">Indicates how to handle segment integrity issues.</param>
+    /// <param name="buffer">Buffer to store the data read from the stream.</param>
     public static void ParseOptionalChunks(
         BufferedReadStream stream,
         WebpChunkType chunkType,
         ImageMetadata metadata,
-        bool ignoreMetaData,
+        bool ignoreMetadata,
         SegmentIntegrityHandling segmentIntegrityHandling,
         Span<byte> buffer)
     {
         long streamLength = stream.Length;
         while (stream.Position < streamLength)
         {
-            uint chunkLength = ReadChunkSize(stream, buffer);
-
-            if (ignoreMetaData)
-            {
-                stream.Skip((int)chunkLength);
-            }
-
-            int bytesRead;
             switch (chunkType)
             {
-                case WebpChunkType.Exif:
-                    byte[] exifData = new byte[chunkLength];
-                    bytesRead = stream.Read(exifData, 0, (int)chunkLength);
-                    if (bytesRead != chunkLength)
-                    {
-                        if (segmentIntegrityHandling == SegmentIntegrityHandling.IgnoreNone)
-                        {
-                            WebpThrowHelper.ThrowImageFormatException("Could not read enough data for the EXIF profile");
-                        }
-
-                        return;
-                    }
-
-                    if (metadata.ExifProfile == null)
-                    {
-                        ExifProfile exifProfile = new(exifData);
-
-                        // Set the resolution from the metadata.
-                        double horizontalValue = GetExifResolutionValue(exifProfile, ExifTag.XResolution);
-                        double verticalValue = GetExifResolutionValue(exifProfile, ExifTag.YResolution);
-
-                        if (horizontalValue > 0 && verticalValue > 0)
-                        {
-                            metadata.HorizontalResolution = horizontalValue;
-                            metadata.VerticalResolution = verticalValue;
-                            metadata.ResolutionUnits = UnitConverter.ExifProfileToResolutionUnit(exifProfile);
-                        }
-
-                        metadata.ExifProfile = exifProfile;
-                    }
+                case WebpChunkType.Iccp:
+                    ReadIccProfile(stream, metadata, ignoreMetadata, segmentIntegrityHandling, buffer);
+                    break;
 
+                case WebpChunkType.Exif:
+                    ReadExifProfile(stream, metadata, ignoreMetadata, segmentIntegrityHandling, buffer);
                     break;
                 case WebpChunkType.Xmp:
-                    byte[] xmpData = new byte[chunkLength];
-                    bytesRead = stream.Read(xmpData, 0, (int)chunkLength);
-                    if (bytesRead != chunkLength)
-                    {
-                        if (segmentIntegrityHandling == SegmentIntegrityHandling.IgnoreNone)
-                        {
-                            WebpThrowHelper.ThrowImageFormatException("Could not read enough data for the XMP profile");
-                        }
-
-                        return;
-                    }
-
-                    metadata.XmpProfile ??= new XmpProfile(xmpData);
-
+                    ReadXmpProfile(stream, metadata, ignoreMetadata, segmentIntegrityHandling, buffer);
                     break;
                 default:
+
+                    // Ignore unknown chunks.
+                    // These must always fall after the image data so we are safe to always skip them.
+                    uint chunkLength = ReadChunkSize(stream, buffer, false);
                     stream.Skip((int)chunkLength);
                     break;
             }
         }
     }
 
+    /// <summary>
+    /// Reads the ICCP chunk from the stream.
+    /// </summary>
+    /// <param name="stream">The stream to decode from.</param>
+    /// <param name="metadata">The image metadata.</param>
+    /// <param name="ignoreMetadata">If true, metadata will be ignored.</param>
+    /// <param name="segmentIntegrityHandling">Indicates how to handle segment integrity issues.</param>
+    /// <param name="buffer">Temporary buffer.</param>
+    public static void ReadIccProfile(
+        BufferedReadStream stream,
+        ImageMetadata metadata,
+        bool ignoreMetadata,
+        SegmentIntegrityHandling segmentIntegrityHandling,
+        Span<byte> buffer)
+    {
+        // While ICC profiles are optional, an invalid ICC profile cannot be ignored as it must precede the image data
+        // and since we canot determine its size to allow skipping without reading the chunk size, we have to throw if it's invalid.
+        // Hence we do not consider segment integrity handling here.
+        uint iccpChunkSize = ReadChunkSize(stream, buffer);
+        if (ignoreMetadata || metadata.IccProfile != null)
+        {
+            stream.Skip((int)iccpChunkSize);
+        }
+        else
+        {
+            bool ignoreNone = segmentIntegrityHandling == SegmentIntegrityHandling.IgnoreNone;
+            byte[] iccpData = new byte[iccpChunkSize];
+            int bytesRead = stream.Read(iccpData, 0, (int)iccpChunkSize);
+
+            // We have the size but the profile is invalid if we cannot read enough data.
+            // Use the segment integrity handling to determine if we throw.
+            if (bytesRead != iccpChunkSize && ignoreNone)
+            {
+                WebpThrowHelper.ThrowInvalidImageContentException("Not enough data to read the iccp chunk");
+            }
+
+            IccProfile profile = new(iccpData);
+            if (profile.CheckIsValid())
+            {
+                metadata.IccProfile = profile;
+            }
+        }
+    }
+
+    /// <summary>
+    /// Reads the EXIF profile from the stream.
+    /// </summary>
+    /// <param name="stream">The stream to decode from.</param>
+    /// <param name="metadata">The image metadata.</param>
+    /// <param name="ignoreMetadata">If true, metadata will be ignored.</param>
+    /// <param name="segmentIntegrityHandling">Indicates how to handle segment integrity issues.</param>
+    /// <param name="buffer">Temporary buffer.</param>
+    public static void ReadExifProfile(
+        BufferedReadStream stream,
+        ImageMetadata metadata,
+        bool ignoreMetadata,
+        SegmentIntegrityHandling segmentIntegrityHandling,
+        Span<byte> buffer)
+    {
+        bool ignoreNone = segmentIntegrityHandling == SegmentIntegrityHandling.IgnoreNone;
+        uint exifChunkSize = ReadChunkSize(stream, buffer, ignoreNone);
+        if (ignoreMetadata || metadata.ExifProfile != null)
+        {
+            stream.Skip((int)exifChunkSize);
+        }
+        else
+        {
+            byte[] exifData = new byte[exifChunkSize];
+            int bytesRead = stream.Read(exifData, 0, (int)exifChunkSize);
+            if (bytesRead != exifChunkSize)
+            {
+                if (ignoreNone)
+                {
+                    WebpThrowHelper.ThrowImageFormatException("Could not read enough data for the EXIF profile");
+                }
+
+                return;
+            }
+
+            ExifProfile exifProfile = new(exifData);
+
+            // Set the resolution from the metadata.
+            double horizontalValue = GetExifResolutionValue(exifProfile, ExifTag.XResolution);
+            double verticalValue = GetExifResolutionValue(exifProfile, ExifTag.YResolution);
+
+            if (horizontalValue > 0 && verticalValue > 0)
+            {
+                metadata.HorizontalResolution = horizontalValue;
+                metadata.VerticalResolution = verticalValue;
+                metadata.ResolutionUnits = UnitConverter.ExifProfileToResolutionUnit(exifProfile);
+            }
+
+            metadata.ExifProfile = exifProfile;
+        }
+    }
+
+    /// <summary>
+    /// Reads the XMP profile the stream.
+    /// </summary>
+    /// <param name="stream">The stream to decode from.</param>
+    /// <param name="metadata">The image metadata.</param>
+    /// <param name="ignoreMetadata">If true, metadata will be ignored.</param>
+    /// <param name="segmentIntegrityHandling">Indicates how to handle segment integrity issues.</param>
+    /// <param name="buffer">Temporary buffer.</param>
+    public static void ReadXmpProfile(
+        BufferedReadStream stream,
+        ImageMetadata metadata,
+        bool ignoreMetadata,
+        SegmentIntegrityHandling segmentIntegrityHandling,
+        Span<byte> buffer)
+    {
+        bool ignoreNone = segmentIntegrityHandling == SegmentIntegrityHandling.IgnoreNone;
+
+        uint xmpChunkSize = ReadChunkSize(stream, buffer, ignoreNone);
+        if (ignoreMetadata || metadata.XmpProfile != null)
+        {
+            stream.Skip((int)xmpChunkSize);
+        }
+        else
+        {
+            byte[] xmpData = new byte[xmpChunkSize];
+            int bytesRead = stream.Read(xmpData, 0, (int)xmpChunkSize);
+            if (bytesRead != xmpChunkSize)
+            {
+                if (ignoreNone)
+                {
+                    WebpThrowHelper.ThrowImageFormatException("Could not read enough data for the XMP profile");
+                }
+
+                return;
+            }
+
+            metadata.XmpProfile = new XmpProfile(xmpData);
+        }
+    }
+
     private static double GetExifResolutionValue(ExifProfile exifProfile, ExifTag<Rational> tag)
     {
         if (exifProfile.TryGetValue(tag, out IExifValue<Rational>? resolution))
diff --git a/src/ImageSharp/Formats/Webp/WebpDecoderCore.cs b/src/ImageSharp/Formats/Webp/WebpDecoderCore.cs
index 0e9888adb..fd31a7fad 100644
--- a/src/ImageSharp/Formats/Webp/WebpDecoderCore.cs
+++ b/src/ImageSharp/Formats/Webp/WebpDecoderCore.cs
@@ -3,15 +3,11 @@
 
 using System.Buffers;
 using System.Buffers.Binary;
-using SixLabors.ImageSharp.Common.Helpers;
 using SixLabors.ImageSharp.Formats.Webp.Lossless;
 using SixLabors.ImageSharp.Formats.Webp.Lossy;
 using SixLabors.ImageSharp.IO;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.Metadata;
-using SixLabors.ImageSharp.Metadata.Profiles.Exif;
-using SixLabors.ImageSharp.Metadata.Profiles.Icc;
-using SixLabors.ImageSharp.Metadata.Profiles.Xmp;
 using SixLabors.ImageSharp.PixelFormats;
 
 namespace SixLabors.ImageSharp.Formats.Webp;
@@ -248,7 +244,8 @@ internal sealed class WebpDecoderCore : ImageDecoderCore, IDisposable
                     else
                     {
                         // Ignore unknown chunks.
-                        uint chunkSize = ReadChunkSize(stream, buffer, false);
+                        // These must always fall after the image data so we are safe to always skip them.
+                        uint chunkSize = WebpChunkParsingUtils.ReadChunkSize(stream, buffer, false);
                         stream.Skip((int)chunkSize);
                     }
                 }
@@ -279,18 +276,20 @@ internal sealed class WebpDecoderCore : ImageDecoderCore, IDisposable
         bool ignoreAlpha,
         Span<byte> buffer)
     {
+        bool ignoreMetadata = this.skipMetadata;
+        SegmentIntegrityHandling integrityHandling = this.segmentIntegrityHandling;
         switch (chunkType)
         {
             case WebpChunkType.Iccp:
-                this.ReadIccProfile(stream, metadata, buffer);
+                WebpChunkParsingUtils.ReadIccProfile(stream, metadata, ignoreMetadata, integrityHandling, buffer);
                 break;
 
             case WebpChunkType.Exif:
-                this.ReadExifProfile(stream, metadata, buffer);
+                WebpChunkParsingUtils.ReadExifProfile(stream, metadata, ignoreMetadata, integrityHandling, buffer);
                 break;
 
             case WebpChunkType.Xmp:
-                this.ReadXmpProfile(stream, metadata, buffer);
+                WebpChunkParsingUtils.ReadXmpProfile(stream, metadata, ignoreMetadata, integrityHandling, buffer);
                 break;
 
             case WebpChunkType.AnimationParameter:
@@ -319,7 +318,10 @@ internal sealed class WebpDecoderCore : ImageDecoderCore, IDisposable
     /// <param name="buffer">Temporary buffer.</param>
     private void ParseOptionalChunks(BufferedReadStream stream, ImageMetadata metadata, WebpFeatures features, Span<byte> buffer)
     {
-        if (this.skipMetadata || (!features.ExifProfile && !features.XmpMetaData))
+        bool ignoreMetadata = this.skipMetadata;
+        SegmentIntegrityHandling integrityHandling = this.segmentIntegrityHandling;
+
+        if (ignoreMetadata || (!features.ExifProfile && !features.XmpMetaData))
         {
             return;
         }
@@ -328,139 +330,24 @@ internal sealed class WebpDecoderCore : ImageDecoderCore, IDisposable
         while (stream.Position < streamLength)
         {
             // Read chunk header.
-            WebpChunkType chunkType = ReadChunkType(stream, buffer);
+            WebpChunkType chunkType = WebpChunkParsingUtils.ReadChunkType(stream, buffer);
             if (chunkType == WebpChunkType.Exif && metadata.ExifProfile == null)
             {
-                this.ReadExifProfile(stream, metadata, buffer);
+                WebpChunkParsingUtils.ReadExifProfile(stream, metadata, ignoreMetadata, integrityHandling, buffer);
             }
             else if (chunkType == WebpChunkType.Xmp && metadata.XmpProfile == null)
             {
-                this.ReadXmpProfile(stream, metadata, buffer);
+                WebpChunkParsingUtils.ReadXmpProfile(stream, metadata, ignoreMetadata, integrityHandling, buffer);
             }
             else
             {
                 // Skip duplicate XMP or EXIF chunk.
-                uint chunkLength = ReadChunkSize(stream, buffer);
+                uint chunkLength = WebpChunkParsingUtils.ReadChunkSize(stream, buffer, false);
                 stream.Skip((int)chunkLength);
             }
         }
     }
 
-    /// <summary>
-    /// Reads the EXIF profile from the stream.
-    /// </summary>
-    /// <param name="stream">The stream to decode from.</param>
-    /// <param name="metadata">The image metadata.</param>
-    /// <param name="buffer">Temporary buffer.</param>
-    private void ReadExifProfile(BufferedReadStream stream, ImageMetadata metadata, Span<byte> buffer)
-    {
-        uint exifChunkSize = ReadChunkSize(stream, buffer);
-        if (this.skipMetadata)
-        {
-            stream.Skip((int)exifChunkSize);
-        }
-        else
-        {
-            byte[] exifData = new byte[exifChunkSize];
-            int bytesRead = stream.Read(exifData, 0, (int)exifChunkSize);
-            if (bytesRead != exifChunkSize)
-            {
-                if (this.segmentIntegrityHandling == SegmentIntegrityHandling.IgnoreNone)
-                {
-                    WebpThrowHelper.ThrowImageFormatException("Could not read enough data for the EXIF profile");
-                }
-
-                return;
-            }
-
-            ExifProfile exifProfile = new(exifData);
-
-            // Set the resolution from the metadata.
-            double horizontalValue = GetExifResolutionValue(exifProfile, ExifTag.XResolution);
-            double verticalValue = GetExifResolutionValue(exifProfile, ExifTag.YResolution);
-
-            if (horizontalValue > 0 && verticalValue > 0)
-            {
-                metadata.HorizontalResolution = horizontalValue;
-                metadata.VerticalResolution = verticalValue;
-                metadata.ResolutionUnits = UnitConverter.ExifProfileToResolutionUnit(exifProfile);
-            }
-
-            metadata.ExifProfile = exifProfile;
-        }
-    }
-
-    private static double GetExifResolutionValue(ExifProfile exifProfile, ExifTag<Rational> tag)
-    {
-        if (exifProfile.TryGetValue(tag, out IExifValue<Rational>? resolution))
-        {
-            return resolution.Value.ToDouble();
-        }
-
-        return 0;
-    }
-
-    /// <summary>
-    /// Reads the XMP profile the stream.
-    /// </summary>
-    /// <param name="stream">The stream to decode from.</param>
-    /// <param name="metadata">The image metadata.</param>
-    /// <param name="buffer">Temporary buffer.</param>
-    private void ReadXmpProfile(BufferedReadStream stream, ImageMetadata metadata, Span<byte> buffer)
-    {
-        uint xmpChunkSize = ReadChunkSize(stream, buffer);
-        if (this.skipMetadata)
-        {
-            stream.Skip((int)xmpChunkSize);
-        }
-        else
-        {
-            byte[] xmpData = new byte[xmpChunkSize];
-            int bytesRead = stream.Read(xmpData, 0, (int)xmpChunkSize);
-            if (bytesRead != xmpChunkSize)
-            {
-                if (this.segmentIntegrityHandling == SegmentIntegrityHandling.IgnoreNone)
-                {
-                    WebpThrowHelper.ThrowImageFormatException("Could not read enough data for the XMP profile");
-                }
-
-                return;
-            }
-
-            metadata.XmpProfile = new XmpProfile(xmpData);
-        }
-    }
-
-    /// <summary>
-    /// Reads the ICCP chunk from the stream.
-    /// </summary>
-    /// <param name="stream">The stream to decode from.</param>
-    /// <param name="metadata">The image metadata.</param>
-    /// <param name="buffer">Temporary buffer.</param>
-    private void ReadIccProfile(BufferedReadStream stream, ImageMetadata metadata, Span<byte> buffer)
-    {
-        uint iccpChunkSize = ReadChunkSize(stream, buffer);
-        if (this.skipMetadata)
-        {
-            stream.Skip((int)iccpChunkSize);
-        }
-        else
-        {
-            byte[] iccpData = new byte[iccpChunkSize];
-            int bytesRead = stream.Read(iccpData, 0, (int)iccpChunkSize);
-            if (bytesRead != iccpChunkSize)
-            {
-                WebpThrowHelper.ThrowInvalidImageContentException("Not enough data to read the iccp chunk");
-            }
-
-            IccProfile profile = new(iccpData);
-            if (profile.CheckIsValid())
-            {
-                metadata.IccProfile = profile;
-            }
-        }
-    }
-
     /// <summary>
     /// Reads the animation parameters chunk from the stream.
     /// </summary>
@@ -512,50 +399,6 @@ internal sealed class WebpDecoderCore : ImageDecoderCore, IDisposable
         }
     }
 
-    /// <summary>
-    /// Identifies the chunk type from the chunk.
-    /// </summary>
-    /// <param name="stream">The stream to decode from.</param>
-    /// <param name="buffer">Temporary buffer.</param>
-    /// <exception cref="ImageFormatException">
-    /// Thrown if the input stream is not valid.
-    /// </exception>
-    private static WebpChunkType ReadChunkType(BufferedReadStream stream, Span<byte> buffer)
-    {
-        if (stream.Read(buffer, 0, 4) == 4)
-        {
-            return (WebpChunkType)BinaryPrimitives.ReadUInt32BigEndian(buffer);
-        }
-
-        throw new ImageFormatException("Invalid Webp data.");
-    }
-
-    /// <summary>
-    /// Reads the chunk size. If Chunk Size is odd, a single padding byte will be added to the payload,
-    /// so the chunk size will be increased by 1 in those cases.
-    /// </summary>
-    /// <param name="stream">The stream to decode from.</param>
-    /// <param name="buffer">Temporary buffer.</param>
-    /// <param name="required">If true, the chunk size is required to be read, otherwise it can be skipped.</param>
-    /// <returns>The chunk size in bytes.</returns>
-    /// <exception cref="ImageFormatException">Invalid data.</exception>
-    private static uint ReadChunkSize(BufferedReadStream stream, Span<byte> buffer, bool required = true)
-    {
-        if (stream.Read(buffer, 0, 4) == 4)
-        {
-            uint chunkSize = BinaryPrimitives.ReadUInt32LittleEndian(buffer);
-            return (chunkSize % 2 == 0) ? chunkSize : chunkSize + 1;
-        }
-
-        if (required)
-        {
-            throw new ImageFormatException("Invalid Webp data.");
-        }
-
-        // Return the size of the remaining data in the stream.
-        return (uint)(stream.Length - stream.Position);
-    }
-
     /// <inheritdoc/>
     public void Dispose() => this.alphaData?.Dispose();
 }
diff --git a/src/ImageSharp/Image.FromBytes.cs b/src/ImageSharp/Image.FromBytes.cs
index 96ef84510..d48065d01 100644
--- a/src/ImageSharp/Image.FromBytes.cs
+++ b/src/ImageSharp/Image.FromBytes.cs
@@ -34,7 +34,12 @@ public abstract partial class Image
     /// <exception cref="UnknownImageFormatException">The encoded image format is unknown.</exception>
     public static unsafe IImageFormat DetectFormat(DecoderOptions options, ReadOnlySpan<byte> buffer)
     {
-        Guard.NotNull(options, nameof(options.Configuration));
+        Guard.NotNull(options, nameof(options));
+
+        if (buffer.IsEmpty)
+        {
+            throw new UnknownImageFormatException("Cannot detect image format from empty data.");
+        }
 
         fixed (byte* ptr = buffer)
         {
@@ -66,6 +71,13 @@ public abstract partial class Image
     /// <exception cref="UnknownImageFormatException">The encoded image format is unknown.</exception>
     public static unsafe ImageInfo Identify(DecoderOptions options, ReadOnlySpan<byte> buffer)
     {
+        Guard.NotNull(options, nameof(options));
+
+        if (buffer.IsEmpty)
+        {
+            throw new UnknownImageFormatException("Cannot identify image format from empty data.");
+        }
+
         fixed (byte* ptr = buffer)
         {
             using UnmanagedMemoryStream stream = new(ptr, buffer.Length);
@@ -99,6 +111,13 @@ public abstract partial class Image
     /// <exception cref="UnknownImageFormatException">The encoded image format is unknown.</exception>
     public static unsafe Image Load(DecoderOptions options, ReadOnlySpan<byte> buffer)
     {
+        Guard.NotNull(options, nameof(options));
+
+        if (buffer.IsEmpty)
+        {
+            throw new UnknownImageFormatException("Cannot load image from empty data.");
+        }
+
         fixed (byte* ptr = buffer)
         {
             using UnmanagedMemoryStream stream = new(ptr, buffer.Length);
@@ -133,6 +152,13 @@ public abstract partial class Image
     public static unsafe Image<TPixel> Load<TPixel>(DecoderOptions options, ReadOnlySpan<byte> data)
         where TPixel : unmanaged, IPixel<TPixel>
     {
+        Guard.NotNull(options, nameof(options));
+
+        if (data.IsEmpty)
+        {
+            throw new UnknownImageFormatException("Cannot load image from empty data.");
+        }
+
         fixed (byte* ptr = data)
         {
             using UnmanagedMemoryStream stream = new(ptr, data.Length);
diff --git a/src/ImageSharp/Image.LoadPixelData.cs b/src/ImageSharp/Image.LoadPixelData.cs
index 53b672b7d..efe1b6e2f 100644
--- a/src/ImageSharp/Image.LoadPixelData.cs
+++ b/src/ImageSharp/Image.LoadPixelData.cs
@@ -69,6 +69,11 @@ public abstract partial class Image
     {
         Guard.NotNull(configuration, nameof(configuration));
 
+        if (data.IsEmpty)
+        {
+            throw new ArgumentException("Pixel data cannot be empty.", nameof(data));
+        }
+
         int count = width * height;
         Guard.MustBeGreaterThanOrEqualTo(data.Length, count, nameof(data));
 
diff --git a/src/ImageSharp/ImageSharp.csproj b/src/ImageSharp/ImageSharp.csproj
index b7629044a..2c7172387 100644
--- a/src/ImageSharp/ImageSharp.csproj
+++ b/src/ImageSharp/ImageSharp.csproj
@@ -30,7 +30,7 @@
   <Choose>
     <When Condition="$(SIXLABORS_TESTING_PREVIEW) == true">
       <PropertyGroup>
-        <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+        <TargetFrameworks>net8.0;net10.0</TargetFrameworks>
       </PropertyGroup>
     </When>
     <Otherwise>
diff --git a/src/ImageSharp/Metadata/Profiles/Exif/ExifProfile.cs b/src/ImageSharp/Metadata/Profiles/Exif/ExifProfile.cs
index d7932f90b..aa2eb29e7 100644
--- a/src/ImageSharp/Metadata/Profiles/Exif/ExifProfile.cs
+++ b/src/ImageSharp/Metadata/Profiles/Exif/ExifProfile.cs
@@ -318,7 +318,7 @@ public sealed class ExifProfile : IDeepCloneable<ExifProfile>
         {
             if (location.Value?.Length == 2)
             {
-                Vector2 point = TransformUtils.ProjectiveTransform2D(location.Value[0], location.Value[1], matrix);
+                Vector2 point = TransformUtilities.ProjectiveTransform2D(location.Value[0], location.Value[1], matrix);
 
                 // Ensure the point is within the image dimensions.
                 point = Vector2.Clamp(point, Vector2.Zero, new Vector2(width - 1, height - 1));
@@ -340,18 +340,18 @@ public sealed class ExifProfile : IDeepCloneable<ExifProfile>
             if (area.Value?.Length == 4)
             {
                 RectangleF rectangle = new(area.Value[0], area.Value[1], area.Value[2], area.Value[3]);
-                if (!TransformUtils.TryGetTransformedRectangle(rectangle, matrix, out Rectangle bounds))
+                if (!TransformUtilities.TryGetTransformedRectangle(rectangle, matrix, out RectangleF bounds))
                 {
                     return;
                 }
 
                 // Ensure the bounds are within the image dimensions.
-                bounds = Rectangle.Intersect(bounds, new Rectangle(0, 0, width, height));
+                bounds = RectangleF.Intersect(bounds, new Rectangle(0, 0, width, height));
 
-                area.Value[0] = (ushort)bounds.X;
-                area.Value[1] = (ushort)bounds.Y;
-                area.Value[2] = (ushort)bounds.Width;
-                area.Value[3] = (ushort)bounds.Height;
+                area.Value[0] = (ushort)MathF.Floor(bounds.X);
+                area.Value[1] = (ushort)MathF.Floor(bounds.Y);
+                area.Value[2] = (ushort)MathF.Ceiling(bounds.Width);
+                area.Value[3] = (ushort)MathF.Ceiling(bounds.Height);
                 this.SetValue(ExifTag.SubjectArea, area.Value);
             }
             else
diff --git a/src/ImageSharp/Primitives/Point.cs b/src/ImageSharp/Primitives/Point.cs
index 8ace7ffac..8627fe980 100644
--- a/src/ImageSharp/Primitives/Point.cs
+++ b/src/ImageSharp/Primitives/Point.cs
@@ -69,7 +69,7 @@ public struct Point : IEquatable<Point>
     /// Gets a value indicating whether this <see cref="Point"/> is empty.
     /// </summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public bool IsEmpty => this.Equals(Empty);
+    public readonly bool IsEmpty => this.Equals(Empty);
 
     /// <summary>
     /// Creates a <see cref="PointF"/> with the coordinates of the specified <see cref="Point"/>.
@@ -239,7 +239,7 @@ public struct Point : IEquatable<Point>
     /// </summary>
     /// <param name="x">The out value for X.</param>
     /// <param name="y">The out value for Y.</param>
-    public void Deconstruct(out int x, out int y)
+    public readonly void Deconstruct(out int x, out int y)
     {
         x = this.X;
         y = this.Y;
@@ -268,17 +268,17 @@ public struct Point : IEquatable<Point>
     public void Offset(Point point) => this.Offset(point.X, point.Y);
 
     /// <inheritdoc/>
-    public override int GetHashCode() => HashCode.Combine(this.X, this.Y);
+    public override readonly int GetHashCode() => HashCode.Combine(this.X, this.Y);
 
     /// <inheritdoc/>
-    public override string ToString() => $"Point [ X={this.X}, Y={this.Y} ]";
+    public override readonly string ToString() => $"Point [ X={this.X}, Y={this.Y} ]";
 
     /// <inheritdoc/>
-    public override bool Equals(object? obj) => obj is Point other && this.Equals(other);
+    public override readonly bool Equals(object? obj) => obj is Point other && this.Equals(other);
 
     /// <inheritdoc/>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public bool Equals(Point other) => this.X.Equals(other.X) && this.Y.Equals(other.Y);
+    public readonly bool Equals(Point other) => this.X.Equals(other.X) && this.Y.Equals(other.Y);
 
     private static short HighInt16(int n) => unchecked((short)((n >> 16) & 0xffff));
 
diff --git a/src/ImageSharp/Primitives/PointF.cs b/src/ImageSharp/Primitives/PointF.cs
index de363e2bd..35a506bb4 100644
--- a/src/ImageSharp/Primitives/PointF.cs
+++ b/src/ImageSharp/Primitives/PointF.cs
@@ -58,7 +58,7 @@ public struct PointF : IEquatable<PointF>
     /// Gets a value indicating whether this <see cref="PointF"/> is empty.
     /// </summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public bool IsEmpty => this.Equals(Empty);
+    public readonly bool IsEmpty => this.Equals(Empty);
 
     /// <summary>
     /// Creates a <see cref="Vector2"/> with the coordinates of the specified <see cref="PointF"/>.
@@ -251,7 +251,7 @@ public struct PointF : IEquatable<PointF>
     /// </summary>
     /// <param name="x">The out value for X.</param>
     /// <param name="y">The out value for Y.</param>
-    public void Deconstruct(out float x, out float y)
+    public readonly void Deconstruct(out float x, out float y)
     {
         x = this.X;
         y = this.Y;
@@ -277,15 +277,15 @@ public struct PointF : IEquatable<PointF>
     public void Offset(PointF point) => this.Offset(point.X, point.Y);
 
     /// <inheritdoc/>
-    public override int GetHashCode() => HashCode.Combine(this.X, this.Y);
+    public override readonly int GetHashCode() => HashCode.Combine(this.X, this.Y);
 
     /// <inheritdoc/>
-    public override string ToString() => $"PointF [ X={this.X}, Y={this.Y} ]";
+    public override readonly string ToString() => $"PointF [ X={this.X}, Y={this.Y} ]";
 
     /// <inheritdoc/>
-    public override bool Equals(object? obj) => obj is PointF pointF && this.Equals(pointF);
+    public override readonly bool Equals(object? obj) => obj is PointF pointF && this.Equals(pointF);
 
     /// <inheritdoc/>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public bool Equals(PointF other) => this.X.Equals(other.X) && this.Y.Equals(other.Y);
+    public readonly bool Equals(PointF other) => this.X.Equals(other.X) && this.Y.Equals(other.Y);
 }
diff --git a/src/ImageSharp/Primitives/SizeF.cs b/src/ImageSharp/Primitives/SizeF.cs
index 81c749875..108ea1eed 100644
--- a/src/ImageSharp/Primitives/SizeF.cs
+++ b/src/ImageSharp/Primitives/SizeF.cs
@@ -67,7 +67,7 @@ public struct SizeF : IEquatable<SizeF>
     /// Gets a value indicating whether this <see cref="SizeF"/> is empty.
     /// </summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public bool IsEmpty => this.Equals(Empty);
+    public readonly bool IsEmpty => this.Equals(Empty);
 
     /// <summary>
     /// Creates a <see cref="Vector2"/> with the coordinates of the specified <see cref="PointF"/>.
@@ -201,24 +201,24 @@ public struct SizeF : IEquatable<SizeF>
     /// </summary>
     /// <param name="width">The out value for the width.</param>
     /// <param name="height">The out value for the height.</param>
-    public void Deconstruct(out float width, out float height)
+    public readonly void Deconstruct(out float width, out float height)
     {
         width = this.Width;
         height = this.Height;
     }
 
     /// <inheritdoc/>
-    public override int GetHashCode() => HashCode.Combine(this.Width, this.Height);
+    public override readonly int GetHashCode() => HashCode.Combine(this.Width, this.Height);
 
     /// <inheritdoc/>
-    public override string ToString() => $"SizeF [ Width={this.Width}, Height={this.Height} ]";
+    public override readonly string ToString() => $"SizeF [ Width={this.Width}, Height={this.Height} ]";
 
     /// <inheritdoc/>
-    public override bool Equals(object? obj) => obj is SizeF && this.Equals((SizeF)obj);
+    public override readonly bool Equals(object? obj) => obj is SizeF sizeF && this.Equals(sizeF);
 
     /// <inheritdoc/>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public bool Equals(SizeF other) => this.Width.Equals(other.Width) && this.Height.Equals(other.Height);
+    public readonly bool Equals(SizeF other) => this.Width.Equals(other.Width) && this.Height.Equals(other.Height);
 
     /// <summary>
     /// Multiplies <see cref="SizeF"/> by a <see cref="float"/> producing <see cref="SizeF"/>.
diff --git a/src/ImageSharp/Processing/AffineTransformBuilder.cs b/src/ImageSharp/Processing/AffineTransformBuilder.cs
index 6d1e8aaa5..c1e11a1d4 100644
--- a/src/ImageSharp/Processing/AffineTransformBuilder.cs
+++ b/src/ImageSharp/Processing/AffineTransformBuilder.cs
@@ -17,24 +17,9 @@ public class AffineTransformBuilder
     /// Initializes a new instance of the <see cref="AffineTransformBuilder"/> class.
     /// </summary>
     public AffineTransformBuilder()
-        : this(TransformSpace.Pixel)
     {
     }
 
-    /// <summary>
-    /// Initializes a new instance of the <see cref="AffineTransformBuilder"/> class.
-    /// </summary>
-    /// <param name="transformSpace">
-    /// The <see cref="TransformSpace"/> to use when applying the affine transform.
-    /// </param>
-    public AffineTransformBuilder(TransformSpace transformSpace)
-        => this.TransformSpace = transformSpace;
-
-    /// <summary>
-    /// Gets the <see cref="TransformSpace"/> to use when applying the affine transform.
-    /// </summary>
-    public TransformSpace TransformSpace { get; }
-
     /// <summary>
     /// Prepends a rotation matrix using the given rotation angle in degrees
     /// and the image center point as rotation center.
@@ -52,7 +37,7 @@ public class AffineTransformBuilder
     /// <returns>The <see cref="AffineTransformBuilder"/>.</returns>
     public AffineTransformBuilder PrependRotationRadians(float radians)
         => this.Prepend(
-            size => TransformUtils.CreateRotationTransformMatrixRadians(radians, size, this.TransformSpace));
+            size => TransformUtilities.CreateRotationTransformMatrixRadians(radians, size));
 
     /// <summary>
     /// Prepends a rotation matrix using the given rotation in degrees at the given origin.
@@ -88,7 +73,7 @@ public class AffineTransformBuilder
     /// <param name="radians">The amount of rotation, in radians.</param>
     /// <returns>The <see cref="AffineTransformBuilder"/>.</returns>
     public AffineTransformBuilder AppendRotationRadians(float radians)
-        => this.Append(size => TransformUtils.CreateRotationTransformMatrixRadians(radians, size, this.TransformSpace));
+        => this.Append(size => TransformUtilities.CreateRotationTransformMatrixRadians(radians, size));
 
     /// <summary>
     /// Appends a rotation matrix using the given rotation in degrees at the given origin.
@@ -172,7 +157,7 @@ public class AffineTransformBuilder
     /// <param name="radiansY">The Y angle, in radians.</param>
     /// <returns>The <see cref="AffineTransformBuilder"/>.</returns>
     public AffineTransformBuilder PrependSkewRadians(float radiansX, float radiansY)
-        => this.Prepend(size => TransformUtils.CreateSkewTransformMatrixRadians(radiansX, radiansY, size, this.TransformSpace));
+        => this.Prepend(size => TransformUtilities.CreateSkewTransformMatrixRadians(radiansX, radiansY, size));
 
     /// <summary>
     /// Prepends a skew matrix using the given angles in degrees at the given origin.
@@ -210,7 +195,7 @@ public class AffineTransformBuilder
     /// <param name="radiansY">The Y angle, in radians.</param>
     /// <returns>The <see cref="AffineTransformBuilder"/>.</returns>
     public AffineTransformBuilder AppendSkewRadians(float radiansX, float radiansY)
-        => this.Append(size => TransformUtils.CreateSkewTransformMatrixRadians(radiansX, radiansY, size, this.TransformSpace));
+        => this.Append(size => TransformUtilities.CreateSkewTransformMatrixRadians(radiansX, radiansY, size));
 
     /// <summary>
     /// Appends a skew matrix using the given angles in degrees at the given origin.
@@ -344,15 +329,29 @@ public class AffineTransformBuilder
     /// for linear transforms.
     /// </exception>
     /// <returns>The <see cref="Size"/>.</returns>
-    public Size GetTransformedSize(Rectangle sourceRectangle)
+    public SizeF GetTransformedSize(Rectangle sourceRectangle)
     {
         Matrix3x2 matrix = this.BuildMatrix(sourceRectangle);
-        return TransformUtils.GetTransformedSize(matrix, sourceRectangle.Size, this.TransformSpace);
+        return GetTransformedSize(sourceRectangle, matrix);
     }
 
+    /// <summary>
+    /// Returns the size of a rectangle large enough to contain the transformed source rectangle.
+    /// </summary>
+    /// <param name="sourceRectangle">The rectangle in the source image.</param>
+    /// <param name="matrix">The transformation matrix.</param>
+    /// <exception cref="DegenerateTransformException">
+    /// The resultant matrix is degenerate containing one or more values equivalent
+    /// to <see cref="float.NaN"/> or a zero determinant and therefore cannot be used
+    /// for linear transforms.
+    /// </exception>
+    /// <returns>The <see cref="Size"/>.</returns>
+    internal static SizeF GetTransformedSize(Rectangle sourceRectangle, Matrix3x2 matrix)
+        => TransformUtilities.GetRawTransformedSize(matrix, sourceRectangle.Size);
+
     private static void CheckDegenerate(Matrix3x2 matrix)
     {
-        if (TransformUtils.IsDegenerate(matrix))
+        if (TransformUtilities.IsDegenerate(matrix))
         {
             throw new DegenerateTransformException("Matrix is degenerate. Check input values.");
         }
diff --git a/src/ImageSharp/Processing/Extensions/Transforms/TransformExtensions.cs b/src/ImageSharp/Processing/Extensions/Transforms/TransformExtensions.cs
index 60f90b10f..dd200013a 100644
--- a/src/ImageSharp/Processing/Extensions/Transforms/TransformExtensions.cs
+++ b/src/ImageSharp/Processing/Extensions/Transforms/TransformExtensions.cs
@@ -7,8 +7,8 @@ using SixLabors.ImageSharp.Processing.Processors.Transforms;
 namespace SixLabors.ImageSharp.Processing;
 
 /// <summary>
-/// Defines extensions that allow the application of composable transform operations on an <see cref="Image"/>
-/// using Mutate/Clone.
+/// Defines extensions that allow the application of composable transform operations
+/// on an <see cref="IImageProcessingContext"/> using Mutate/Clone.
 /// </summary>
 public static class TransformExtensions
 {
@@ -51,7 +51,7 @@ public static class TransformExtensions
         IResampler sampler)
     {
         Matrix3x2 transform = builder.BuildMatrix(sourceRectangle);
-        Size targetDimensions = builder.GetTransformedSize(sourceRectangle);
+        Size targetDimensions = TransformUtilities.GetTransformedCanvasSize(transform, sourceRectangle.Size);
         return source.Transform(sourceRectangle, transform, targetDimensions, sampler);
     }
 
@@ -113,7 +113,7 @@ public static class TransformExtensions
         IResampler sampler)
     {
         Matrix4x4 transform = builder.BuildMatrix(sourceRectangle);
-        Size targetDimensions = builder.GetTransformedSize(sourceRectangle);
+        Size targetDimensions = TransformUtilities.GetTransformedCanvasSize(transform, sourceRectangle.Size);
         return source.Transform(sourceRectangle, transform, targetDimensions, sampler);
     }
 
diff --git a/src/ImageSharp/Processing/Processors/Transforms/Linear/AffineTransformProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/Linear/AffineTransformProcessor.cs
index 30c279e59..afd1b70b7 100644
--- a/src/ImageSharp/Processing/Processors/Transforms/Linear/AffineTransformProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/Linear/AffineTransformProcessor.cs
@@ -21,7 +21,7 @@ public class AffineTransformProcessor : CloningImageProcessor
         Guard.NotNull(sampler, nameof(sampler));
         Guard.MustBeValueType(sampler);
 
-        if (TransformUtils.IsDegenerate(matrix))
+        if (TransformUtilities.IsDegenerate(matrix))
         {
             throw new DegenerateTransformException("Matrix is degenerate. Check input values.");
         }
diff --git a/src/ImageSharp/Processing/Processors/Transforms/Linear/AffineTransformProcessor{TPixel}.cs b/src/ImageSharp/Processing/Processors/Transforms/Linear/AffineTransformProcessor{TPixel}.cs
index aec6c3c27..fe4e22ebc 100644
--- a/src/ImageSharp/Processing/Processors/Transforms/Linear/AffineTransformProcessor{TPixel}.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/Linear/AffineTransformProcessor{TPixel}.cs
@@ -77,7 +77,9 @@ internal class AffineTransformProcessor<TPixel> : TransformProcessor<TPixel>, IR
             return;
         }
 
-        // Convert from screen to world space.
+        // All matrices are defined in normalized coordinate space so we need to convert to pixel space.
+        // After normalization we need to invert the matrix for correct sampling.
+        matrix = TransformUtilities.NormalizeToPixel(matrix);
         Matrix3x2.Invert(matrix, out matrix);
 
         if (sampler is NearestNeighborResampler)
diff --git a/src/ImageSharp/Processing/Processors/Transforms/Linear/ProjectiveTransformProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/Linear/ProjectiveTransformProcessor.cs
index 9e9507b73..1c457e84c 100644
--- a/src/ImageSharp/Processing/Processors/Transforms/Linear/ProjectiveTransformProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/Linear/ProjectiveTransformProcessor.cs
@@ -21,7 +21,7 @@ public sealed class ProjectiveTransformProcessor : CloningImageProcessor
         Guard.NotNull(sampler, nameof(sampler));
         Guard.MustBeValueType(sampler);
 
-        if (TransformUtils.IsDegenerate(matrix))
+        if (TransformUtilities.IsDegenerate(matrix))
         {
             throw new DegenerateTransformException("Matrix is degenerate. Check input values.");
         }
diff --git a/src/ImageSharp/Processing/Processors/Transforms/Linear/ProjectiveTransformProcessor{TPixel}.cs b/src/ImageSharp/Processing/Processors/Transforms/Linear/ProjectiveTransformProcessor{TPixel}.cs
index 1c30fd114..ecf587684 100644
--- a/src/ImageSharp/Processing/Processors/Transforms/Linear/ProjectiveTransformProcessor{TPixel}.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/Linear/ProjectiveTransformProcessor{TPixel}.cs
@@ -75,7 +75,9 @@ internal class ProjectiveTransformProcessor<TPixel> : TransformProcessor<TPixel>
             return;
         }
 
-        // Convert from screen to world space.
+        // All matrices are defined in normalized coordinate space so we need to convert to pixel space.
+        // After normalization we need to invert the matrix for correct sampling.
+        matrix = TransformUtilities.NormalizeToPixel(matrix);
         Matrix4x4.Invert(matrix, out matrix);
 
         if (sampler is NearestNeighborResampler)
@@ -135,7 +137,7 @@ internal class ProjectiveTransformProcessor<TPixel> : TransformProcessor<TPixel>
 
             for (int x = 0; x < destinationRowSpan.Length; x++)
             {
-                Vector2 point = TransformUtils.ProjectiveTransform2D(x, y, this.matrix);
+                Vector2 point = TransformUtilities.ProjectiveTransform2D(x, y, this.matrix);
                 int px = (int)MathF.Round(point.X);
                 int py = (int)MathF.Round(point.Y);
 
@@ -207,7 +209,7 @@ internal class ProjectiveTransformProcessor<TPixel> : TransformProcessor<TPixel>
 
                 for (int x = 0; x < span.Length; x++)
                 {
-                    Vector2 point = TransformUtils.ProjectiveTransform2D(x, y, matrix);
+                    Vector2 point = TransformUtilities.ProjectiveTransform2D(x, y, matrix);
                     float pY = point.Y;
                     float pX = point.X;
 
diff --git a/src/ImageSharp/Processing/Processors/Transforms/Linear/RotateProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/Linear/RotateProcessor.cs
index 0af2b268a..ea0f1c113 100644
--- a/src/ImageSharp/Processing/Processors/Transforms/Linear/RotateProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/Linear/RotateProcessor.cs
@@ -28,14 +28,14 @@ public sealed class RotateProcessor : AffineTransformProcessor
     /// <param name="sourceSize">The source image size</param>
     public RotateProcessor(float degrees, IResampler sampler, Size sourceSize)
         : this(
-            TransformUtils.CreateRotationTransformMatrixDegrees(degrees, sourceSize, TransformSpace.Pixel),
+            TransformUtilities.CreateRotationTransformMatrixDegrees(degrees, sourceSize),
             sampler,
             sourceSize)
         => this.Degrees = degrees;
 
     // Helper constructor
     private RotateProcessor(Matrix3x2 rotationMatrix, IResampler sampler, Size sourceSize)
-        : base(rotationMatrix, sampler, TransformUtils.GetTransformedSize(rotationMatrix, sourceSize, TransformSpace.Pixel))
+        : base(rotationMatrix, sampler, TransformUtilities.GetTransformedCanvasSize(rotationMatrix, sourceSize))
     {
     }
 
diff --git a/src/ImageSharp/Processing/Processors/Transforms/Linear/SkewProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/Linear/SkewProcessor.cs
index 0bbc8e0f6..9c23a9532 100644
--- a/src/ImageSharp/Processing/Processors/Transforms/Linear/SkewProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/Linear/SkewProcessor.cs
@@ -30,7 +30,7 @@ public sealed class SkewProcessor : AffineTransformProcessor
     /// <param name="sourceSize">The source image size</param>
     public SkewProcessor(float degreesX, float degreesY, IResampler sampler, Size sourceSize)
         : this(
-             TransformUtils.CreateSkewTransformMatrixDegrees(degreesX, degreesY, sourceSize, TransformSpace.Pixel),
+             TransformUtilities.CreateSkewTransformMatrixDegrees(degreesX, degreesY, sourceSize),
              sampler,
              sourceSize)
     {
@@ -40,7 +40,7 @@ public sealed class SkewProcessor : AffineTransformProcessor
 
     // Helper constructor:
     private SkewProcessor(Matrix3x2 skewMatrix, IResampler sampler, Size sourceSize)
-        : base(skewMatrix, sampler, TransformUtils.GetTransformedSize(skewMatrix, sourceSize, TransformSpace.Pixel))
+        : base(skewMatrix, sampler, TransformUtilities.GetTransformedCanvasSize(skewMatrix, sourceSize))
     {
     }
 
diff --git a/src/ImageSharp/Processing/Processors/Transforms/SwizzleProcessor{TSwizzler,TPixel}.cs b/src/ImageSharp/Processing/Processors/Transforms/SwizzleProcessor{TSwizzler,TPixel}.cs
index 3bec82cce..9acf18730 100644
--- a/src/ImageSharp/Processing/Processors/Transforms/SwizzleProcessor{TSwizzler,TPixel}.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/SwizzleProcessor{TSwizzler,TPixel}.cs
@@ -24,7 +24,7 @@ internal class SwizzleProcessor<TSwizzler, TPixel> : TransformProcessor<TPixel>
         // Calculate the transform matrix from the swizzle operation to allow us
         // to update any metadata that represents pixel coordinates in the source image.
         this.transformMatrix = new ProjectiveTransformBuilder()
-            .AppendMatrix(TransformUtils.GetSwizzlerMatrix(swizzler, sourceRectangle))
+            .AppendMatrix(TransformUtilities.GetSwizzlerMatrix(swizzler, sourceRectangle))
             .BuildMatrix(sourceRectangle);
     }
 
diff --git a/src/ImageSharp/Processing/Processors/Transforms/TransformUtils.cs b/src/ImageSharp/Processing/Processors/Transforms/TransformUtilities.cs
similarity index 63%
rename from src/ImageSharp/Processing/Processors/Transforms/TransformUtils.cs
rename to src/ImageSharp/Processing/Processors/Transforms/TransformUtilities.cs
index d25d4f474..17bdeadde 100644
--- a/src/ImageSharp/Processing/Processors/Transforms/TransformUtils.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/TransformUtilities.cs
@@ -10,7 +10,7 @@ namespace SixLabors.ImageSharp.Processing.Processors.Transforms;
 /// <summary>
 /// Contains utility methods for working with transforms.
 /// </summary>
-internal static class TransformUtils
+internal static class TransformUtilities
 {
     /// <summary>
     /// Returns a value that indicates whether the specified matrix is degenerate
@@ -80,79 +80,69 @@ internal static class TransformUtils
     }
 
     /// <summary>
-    /// Creates a centered rotation transform matrix using the given rotation in degrees and the source size.
+    /// Creates a centered rotation transform matrix using the given rotation in degrees and the original source size.
     /// </summary>
     /// <param name="degrees">The amount of rotation, in degrees.</param>
     /// <param name="size">The source image size.</param>
-    /// <param name="transformSpace">The <see cref="TransformSpace"/> to use when creating the centered matrix.</param>
     /// <returns>The <see cref="Matrix3x2"/>.</returns>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public static Matrix3x2 CreateRotationTransformMatrixDegrees(float degrees, Size size, TransformSpace transformSpace)
-        => CreateRotationTransformMatrixRadians(GeometryUtilities.DegreeToRadian(degrees), size, transformSpace);
+    public static Matrix3x2 CreateRotationTransformMatrixDegrees(float degrees, Size size)
+        => CreateRotationTransformMatrixRadians(GeometryUtilities.DegreeToRadian(degrees), size);
 
     /// <summary>
-    /// Creates a centered rotation transform matrix using the given rotation in radians and the source size.
+    /// Creates a centered rotation transform matrix using the given rotation in radians and the original source size.
     /// </summary>
     /// <param name="radians">The amount of rotation, in radians.</param>
     /// <param name="size">The source image size.</param>
-    /// <param name="transformSpace">The <see cref="TransformSpace"/> to use when creating the centered matrix.</param>
     /// <returns>The <see cref="Matrix3x2"/>.</returns>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public static Matrix3x2 CreateRotationTransformMatrixRadians(float radians, Size size, TransformSpace transformSpace)
-        => CreateCenteredTransformMatrix(Matrix3x2Extensions.CreateRotation(radians, PointF.Empty), size, transformSpace);
+    public static Matrix3x2 CreateRotationTransformMatrixRadians(float radians, Size size)
+        => CreateCenteredTransformMatrix(Matrix3x2Extensions.CreateRotation(radians, PointF.Empty), size);
 
     /// <summary>
-    /// Creates a centered skew transform matrix from the give angles in degrees and the source size.
+    /// Creates a centered skew transform matrix from the give angles in degrees and the original source size.
     /// </summary>
     /// <param name="degreesX">The X angle, in degrees.</param>
     /// <param name="degreesY">The Y angle, in degrees.</param>
     /// <param name="size">The source image size.</param>
-    /// <param name="transformSpace">The <see cref="TransformSpace"/> to use when creating the centered matrix.</param>
     /// <returns>The <see cref="Matrix3x2"/>.</returns>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public static Matrix3x2 CreateSkewTransformMatrixDegrees(float degreesX, float degreesY, Size size, TransformSpace transformSpace)
-        => CreateSkewTransformMatrixRadians(GeometryUtilities.DegreeToRadian(degreesX), GeometryUtilities.DegreeToRadian(degreesY), size, transformSpace);
+    public static Matrix3x2 CreateSkewTransformMatrixDegrees(float degreesX, float degreesY, Size size)
+        => CreateSkewTransformMatrixRadians(GeometryUtilities.DegreeToRadian(degreesX), GeometryUtilities.DegreeToRadian(degreesY), size);
 
     /// <summary>
-    /// Creates a centered skew transform matrix from the give angles in radians and the source size.
+    /// Creates a centered skew transform matrix from the give angles in radians and the original source size.
     /// </summary>
     /// <param name="radiansX">The X angle, in radians.</param>
     /// <param name="radiansY">The Y angle, in radians.</param>
     /// <param name="size">The source image size.</param>
-    /// <param name="transformSpace">The <see cref="TransformSpace"/> to use when creating the centered matrix.</param>
     /// <returns>The <see cref="Matrix3x2"/>.</returns>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public static Matrix3x2 CreateSkewTransformMatrixRadians(float radiansX, float radiansY, Size size, TransformSpace transformSpace)
-        => CreateCenteredTransformMatrix(Matrix3x2Extensions.CreateSkew(radiansX, radiansY, PointF.Empty), size, transformSpace);
+    public static Matrix3x2 CreateSkewTransformMatrixRadians(float radiansX, float radiansY, Size size)
+        => CreateCenteredTransformMatrix(Matrix3x2Extensions.CreateSkew(radiansX, radiansY, PointF.Empty), size);
 
     /// <summary>
     /// Gets the centered transform matrix based upon the source rectangle.
     /// </summary>
     /// <param name="matrix">The transformation matrix.</param>
     /// <param name="size">The source image size.</param>
-    /// <param name="transformSpace">
-    /// The <see cref="TransformSpace"/> to use when creating the centered matrix.
-    /// </param>
     /// <returns>The <see cref="Matrix3x2"/></returns>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public static Matrix3x2 CreateCenteredTransformMatrix(Matrix3x2 matrix, Size size, TransformSpace transformSpace)
+    public static Matrix3x2 CreateCenteredTransformMatrix(Matrix3x2 matrix, Size size)
     {
-        Size transformSize = GetUnboundedTransformedSize(matrix, size, transformSpace);
-
-        // We invert the matrix to handle the transformation from screen to world space.
-        // This ensures scaling matrices are correct.
-        Matrix3x2.Invert(matrix, out Matrix3x2 inverted);
+        // 1) Unbounded size.
+        SizeF ts = GetRawTransformedSize(matrix, size);
 
-        // The source size is provided using the coordinate space of the source image.
-        // however the transform should always be applied in the pixel space.
-        // To account for this we offset by the size - 1 to translate to the pixel space.
-        float offset = transformSpace == TransformSpace.Pixel ? 1F : 0F;
+        // 2) Invert the content transform for screen->world.
+        Matrix3x2.Invert(matrix, out Matrix3x2 inv);
 
-        Matrix3x2 translationToTargetCenter = Matrix3x2.CreateTranslation(new Vector2(-(transformSize.Width - offset), -(transformSize.Height - offset)) * .5F);
-        Matrix3x2 translateToSourceCenter = Matrix3x2.CreateTranslation(new Vector2(size.Width - offset, size.Height - offset) * .5F);
+        // 3) Translate target (canvas) so its center is at the origin,
+        // translate source so its center is at the origin, then undo the content transform.
+        Matrix3x2 toTarget = Matrix3x2.CreateTranslation(new Vector2(-ts.Width, -ts.Height) * 0.5f);
+        Matrix3x2 toSource = Matrix3x2.CreateTranslation(new Vector2(size.Width, size.Height) * 0.5f);
 
-        // Translate back to world space.
-        Matrix3x2.Invert(translationToTargetCenter * inverted * translateToSourceCenter, out Matrix3x2 centered);
+        // 4) World->screen.
+        Matrix3x2.Invert(toTarget * inv * toSource, out Matrix3x2 centered);
 
         return centered;
     }
@@ -287,7 +277,6 @@ internal static class TransformUtils
     /// <param name="topRight">The top-right point of the distorted quad.</param>
     /// <param name="bottomRight">The bottom-right point of the distorted quad.</param>
     /// <param name="bottomLeft">The bottom-left point of the distorted quad.</param>
-    /// <param name="transformSpace">The <see cref="TransformSpace"/> to use when creating the matrix.</param>
     /// <returns>The computed projection matrix for the quad distortion.</returns>
     /// <remarks>
     /// This method is based on the algorithm described in the following article:
@@ -298,8 +287,7 @@ internal static class TransformUtils
         PointF topLeft,
         PointF topRight,
         PointF bottomRight,
-        PointF bottomLeft,
-        TransformSpace transformSpace)
+        PointF bottomLeft)
     {
         PointF p1 = new(rectangle.X, rectangle.Y);
         PointF p2 = new(rectangle.X + rectangle.Width, rectangle.Y);
@@ -345,46 +333,94 @@ internal static class TransformUtils
             (float)b[2], (float)b[5], 0, 1);
 #pragma warning restore SA1117
 
-        // Check if the matrix involves only affine transformations by inspecting the relevant components.
-        // We want to use pixel space for calculations only if the transformation is purely 2D and does not include
-        // any perspective effects, non-standard scaling, or unusual translations that could distort the image.
-        if (transformSpace == TransformSpace.Pixel && IsAffineRotationOrSkew(projectionMatrix))
-        {
-            if (projectionMatrix.M41 != 0)
-            {
-                projectionMatrix.M41--;
-            }
-
-            if (projectionMatrix.M42 != 0)
-            {
-                projectionMatrix.M42--;
-            }
-        }
-
         return projectionMatrix;
     }
 
     /// <summary>
-    /// Returns the size relative to the source for the given transformation matrix.
+    /// Calculates the size of a destination canvas large enough to contain
+    /// the fully transformed source content, including any translation offsets.
     /// </summary>
     /// <param name="matrix">The transformation matrix.</param>
-    /// <param name="size">The source size.</param>
-    /// <param name="transformSpace">The <see cref="TransformSpace"/> to use when calculating the size.</param>
-    /// <returns>The <see cref="Size"/>.</returns>
-    public static Size GetTransformedSize(Matrix3x2 matrix, Size size, TransformSpace transformSpace)
-        => GetTransformedSize(matrix, size, transformSpace, true);
+    /// <param name="size">The original source size.</param>
+    /// <returns>
+    /// A <see cref="SizeF"/> representing the dimensions of the destination
+    /// canvas required to fully contain the transformed source, including
+    /// any positive or negative translation offsets.
+    /// </returns>
+    /// <remarks>
+    /// <para>
+    /// This method ensures that the transformed content remains fully visible
+    /// on the destination canvas by expanding its size to include translations
+    /// in all directions.
+    /// </para>
+    /// <para>
+    /// It behaves identically to calling
+    /// <see cref="GetTransformedSize(Matrix3x2, Size, bool)"/> with
+    /// <c>preserveCanvas</c> set to <see langword="true"/>.
+    /// </para>
+    /// <para>
+    /// The resulting canvas size represents the total area required to display
+    /// the transformed image without clipping, not merely the geometric bounds
+    /// of the transformed source.
+    /// </para>
+    /// </remarks>
+    public static Size GetTransformedCanvasSize(Matrix3x2 matrix, Size size)
+        => Size.Ceiling(GetTransformedSize(matrix, size, true));
 
     /// <summary>
-    /// Returns the size relative to the source for the given transformation matrix.
+    /// Calculates the size of a destination canvas large enough to contain
+    /// the fully transformed source content, including any translation offsets.
     /// </summary>
     /// <param name="matrix">The transformation matrix.</param>
-    /// <param name="size">The source size.</param>
-    /// <param name="transformSpace">The <see cref="TransformSpace"/> used when generating the matrix.</param>
+    /// <param name="size">The original source size.</param>
     /// <returns>
-    /// The <see cref="Size"/>.
+    /// A <see cref="SizeF"/> representing the dimensions of the destination
+    /// canvas required to fully contain the transformed source, including
+    /// any positive or negative translation offsets.
     /// </returns>
+    /// <remarks>
+    /// <para>
+    /// This method ensures that the transformed content remains fully visible
+    /// on the destination canvas by expanding its size to include translations
+    /// in all directions.
+    /// </para>
+    /// <para>
+    /// It behaves identically to calling
+    /// <see cref="GetTransformedSize(Matrix3x2, Size, bool)"/> with
+    /// <c>preserveCanvas</c> set to <see langword="true"/>.
+    /// </para>
+    /// <para>
+    /// The resulting canvas size represents the total area required to display
+    /// the transformed image without clipping, not merely the geometric bounds
+    /// of the transformed source.
+    /// </para>
+    /// </remarks>
+    public static Size GetTransformedCanvasSize(Matrix4x4 matrix, Size size)
+        => Size.Ceiling(GetTransformedSize(matrix, size, true));
+
+    /// <summary>
+    /// Returns the size relative to the source for the given transformation matrix.
+    /// </summary>
+    /// <param name="matrix">The transformation matrix.</param>
+    /// <param name="size">The original source size.</param>
+    /// <returns>The <see cref="Size"/>.</returns>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static SizeF GetRawTransformedSize(Matrix4x4 matrix, Size size)
+        => GetTransformedSize(matrix, size, false);
+
+    /// <summary>
+    /// Returns the size of the transformed source. When <paramref name="preserveCanvas"/> is true,
+    /// the size is expanded to include translation so the full moved content remains visible.
+    /// </summary>
+    /// <param name="matrix">The transformation matrix.</param>
+    /// <param name="size">The original source size.</param>
+    /// <param name="preserveCanvas">
+    /// If <see langword="true"/>, expand the size to account for translation (left/up as well as right/down).
+    /// If <see langword="false"/>, return only the transformed span without translation expansion.
+    /// </param>
+    /// <returns>The <see cref="SizeF"/>.</returns>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public static Size GetTransformedSize(Matrix4x4 matrix, Size size, TransformSpace transformSpace)
+    private static SizeF GetTransformedSize(Matrix4x4 matrix, Size size, bool preserveCanvas)
     {
         Guard.IsTrue(size.Width > 0 && size.Height > 0, nameof(size), "Source size dimensions cannot be 0!");
 
@@ -393,27 +429,9 @@ internal static class TransformUtils
             return size;
         }
 
-        // Check if the matrix involves only affine transformations by inspecting the relevant components.
-        // We want to use pixel space for calculations only if the transformation is purely 2D and does not include
-        // any perspective effects, non-standard scaling, or unusual translations that could distort the image.
-        bool usePixelSpace = transformSpace == TransformSpace.Pixel && IsAffineRotationOrSkew(matrix);
-
-        // Define an offset size to translate between pixel space and coordinate space.
-        // When using pixel space, apply a scaling sensitive offset to translate to discrete pixel coordinates.
-        // When not using pixel space, use SizeF.Empty as the offset.
-
-        // Compute scaling factors from the matrix
-        float scaleX = 1F / new Vector2(matrix.M11, matrix.M21).Length(); // sqrt(M11^2 + M21^2)
-        float scaleY = 1F / new Vector2(matrix.M12, matrix.M22).Length(); // sqrt(M12^2 + M22^2)
-
-        // Apply the offset relative to the scale
-        SizeF offsetSize = usePixelSpace ? new SizeF(scaleX, scaleY) : SizeF.Empty;
-
-        // Subtract the offset size to translate to the appropriate space (pixel or coordinate).
-        if (TryGetTransformedRectangle(new RectangleF(Point.Empty, size - offsetSize), matrix, out Rectangle bounds))
+        if (TryGetTransformedRectangle(new RectangleF(Point.Empty, size), matrix, out RectangleF bounds))
         {
-            // Add the offset size back to translate the transformed bounds to the correct space.
-            return Size.Ceiling(ConstrainSize(bounds) + offsetSize);
+            return preserveCanvas ? GetPreserveCanvasSize(bounds) : bounds.Size;
         }
 
         return size;
@@ -438,30 +456,31 @@ internal static class TransformUtils
             swizzler.Transform(new Point(sourceRectangle.Left, sourceRectangle.Top)),
             swizzler.Transform(new Point(sourceRectangle.Right, sourceRectangle.Top)),
             swizzler.Transform(new Point(sourceRectangle.Right, sourceRectangle.Bottom)),
-            swizzler.Transform(new Point(sourceRectangle.Left, sourceRectangle.Bottom)),
-            TransformSpace.Pixel);
+            swizzler.Transform(new Point(sourceRectangle.Left, sourceRectangle.Bottom)));
 
     /// <summary>
     /// Returns the size relative to the source for the given transformation matrix.
     /// </summary>
     /// <param name="matrix">The transformation matrix.</param>
-    /// <param name="size">The source size.</param>
-    /// <param name="transformSpace">The <see cref="TransformSpace"/> to use when calculating the size.</param>
+    /// <param name="size">The original source size.</param>
     /// <returns>The <see cref="Size"/>.</returns>
-    private static Size GetUnboundedTransformedSize(Matrix3x2 matrix, Size size, TransformSpace transformSpace)
-        => GetTransformedSize(matrix, size, transformSpace, false);
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static SizeF GetRawTransformedSize(Matrix3x2 matrix, Size size)
+        => GetTransformedSize(matrix, size, false);
 
     /// <summary>
-    /// Returns the size relative to the source for the given transformation matrix.
+    /// Returns the size of the transformed source. When <paramref name="preserveCanvas"/> is true,
+    /// the size is expanded to include translation so the full moved content remains visible.
     /// </summary>
     /// <param name="matrix">The transformation matrix.</param>
-    /// <param name="size">The source size.</param>
-    /// <param name="transformSpace">The <see cref="TransformSpace"/> to use when calculating the size.</param>
-    /// <param name="constrain">Whether to constrain the size to ensure that the dimensions are positive.</param>
-    /// <returns>
-    /// The <see cref="Size"/>.
-    /// </returns>
-    private static Size GetTransformedSize(Matrix3x2 matrix, Size size, TransformSpace transformSpace, bool constrain)
+    /// <param name="size">The original source size.</param>
+    /// <param name="preserveCanvas">
+    /// If <see langword="true"/>, expand the size to account for translation (left/up as well as right/down).
+    /// If <see langword="false"/>, return only the transformed span without translation expansion.
+    /// </param>
+    /// <returns>The <see cref="SizeF"/>.</returns>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private static SizeF GetTransformedSize(Matrix3x2 matrix, Size size, bool preserveCanvas)
     {
         Guard.IsTrue(size.Width > 0 && size.Height > 0, nameof(size), "Source size dimensions cannot be 0!");
 
@@ -470,21 +489,9 @@ internal static class TransformUtils
             return size;
         }
 
-        // Define an offset size to translate between coordinate space and pixel space.
-        // Compute scaling factors from the matrix
-        SizeF offsetSize = SizeF.Empty;
-        if (transformSpace == TransformSpace.Pixel)
-        {
-            float scaleX = 1F / new Vector2(matrix.M11, matrix.M21).Length(); // sqrt(M11^2 + M21^2)
-            float scaleY = 1F / new Vector2(matrix.M12, matrix.M22).Length(); // sqrt(M12^2 + M22^2)
-            offsetSize = new SizeF(scaleX, scaleY);
-        }
-
-        // Subtract the offset size to translate to the pixel space.
-        if (TryGetTransformedRectangle(new RectangleF(Point.Empty, size - offsetSize), matrix, out Rectangle bounds))
+        if (TryGetTransformedRectangle(new RectangleF(Point.Empty, size), matrix, out RectangleF bounds))
         {
-            // Add the offset size back to translate the transformed bounds to the coordinate space.
-            return Size.Ceiling((constrain ? ConstrainSize(bounds) : bounds.Size) + offsetSize);
+            return preserveCanvas ? GetPreserveCanvasSize(bounds) : bounds.Size;
         }
 
         return size;
@@ -499,7 +506,8 @@ internal static class TransformUtils
     /// <returns>
     /// <see langword="true"/> if the transformation was successful; otherwise, <see langword="false"/>.
     /// </returns>
-    private static bool TryGetTransformedRectangle(RectangleF rectangle, Matrix3x2 matrix, out Rectangle bounds)
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private static bool TryGetTransformedRectangle(RectangleF rectangle, Matrix3x2 matrix, out RectangleF bounds)
     {
         if (matrix.IsIdentity || rectangle.Equals(default))
         {
@@ -526,7 +534,7 @@ internal static class TransformUtils
     /// <see langword="true"/> if the transformation was successful; otherwise, <see langword="false"/>.
     /// </returns>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    internal static bool TryGetTransformedRectangle(RectangleF rectangle, Matrix4x4 matrix, out Rectangle bounds)
+    internal static bool TryGetTransformedRectangle(RectangleF rectangle, Matrix4x4 matrix, out RectangleF bounds)
     {
         if (matrix.IsIdentity || rectangle.Equals(default))
         {
@@ -543,15 +551,61 @@ internal static class TransformUtils
         return true;
     }
 
+    /// <summary>
+    /// Calculates the size of a destination canvas large enough to contain the full
+    /// transformed content of a source rectangle while preserving any translation offsets.
+    /// </summary>
+    /// <param name="rectangle">
+    /// The <see cref="RectangleF"/> representing the transformed bounds of the source content
+    /// in destination (output) space.
+    /// </param>
+    /// <returns>
+    /// A <see cref="SizeF"/> that describes the canvas dimensions required to fully
+    /// contain the transformed content while accounting for any positive or negative translation.
+    /// </returns>
+    /// <remarks>
+    /// <para>
+    /// This method expands the output canvas to ensure that translated content remains visible.
+    /// </para>
+    /// <para>
+    /// If the transformation produces a positive translation, the method extends the canvas
+    /// on the positive side (right or bottom).
+    /// If the transformation produces a negative translation (the content moves left or up),
+    /// the method extends the canvas on the negative side to include that offset.
+    /// </para>
+    /// <para>
+    /// The result is equivalent to taking the union of:
+    /// <list type="bullet">
+    /// <item>
+    /// <description>The original, untransformed rectangle at the origin [0..Width] × [0..Height].</description>
+    /// </item>
+    /// <item>
+    /// <description>The translated rectangle defined by <paramref name="rectangle"/>.</description>
+    /// </item>
+    /// </list>
+    /// This ensures the entire translated image fits within the resulting canvas,
+    /// without trimming any portion caused by translation.
+    /// </para>
+    /// </remarks>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    private static Size ConstrainSize(Rectangle rectangle)
+    private static SizeF GetPreserveCanvasSize(RectangleF rectangle)
     {
-        // We want to resize the canvas here taking into account any translations.
-        int height = rectangle.Top < 0 ? rectangle.Bottom : Math.Max(rectangle.Height, rectangle.Bottom);
-        int width = rectangle.Left < 0 ? rectangle.Right : Math.Max(rectangle.Width, rectangle.Right);
-
-        // If location in either direction is translated to a negative value equal to or exceeding the
-        // dimensions in either direction we need to reassign the dimension.
+        // Compute the required height.
+        // If the top is negative, expand upward by that amount (rectangle.Bottom already includes height).
+        // Otherwise, take the larger of the transformed height or the bottom offset.
+        float height = rectangle.Top < 0
+            ? rectangle.Bottom
+            : MathF.Max(rectangle.Height, rectangle.Bottom);
+
+        // Compute the required width.
+        // If the left is negative, expand leftward by that amount (rectangle.Right already includes width).
+        // Otherwise, take the larger of the transformed width or the right offset.
+        float width = rectangle.Left < 0
+            ? rectangle.Right
+            : MathF.Max(rectangle.Width, rectangle.Right);
+
+        // Guard: if translation exceeds or cancels dimensions,
+        // ensure non-zero positive size using the base rectangle dimensions.
         if (height <= 0)
         {
             height = rectangle.Height;
@@ -562,63 +616,63 @@ internal static class TransformUtils
             width = rectangle.Width;
         }
 
-        return new Size(width, height);
+        // Return the final size that preserves the full visible region of the transformed content.
+        return new SizeF(width, height);
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    private static Rectangle GetBoundingRectangle(Vector2 tl, Vector2 tr, Vector2 bl, Vector2 br)
+    private static RectangleF GetBoundingRectangle(Vector2 tl, Vector2 tr, Vector2 bl, Vector2 br)
     {
-        // Find the minimum and maximum "corners" based on the given vectors
         float left = MathF.Min(tl.X, MathF.Min(tr.X, MathF.Min(bl.X, br.X)));
         float top = MathF.Min(tl.Y, MathF.Min(tr.Y, MathF.Min(bl.Y, br.Y)));
         float right = MathF.Max(tl.X, MathF.Max(tr.X, MathF.Max(bl.X, br.X)));
         float bottom = MathF.Max(tl.Y, MathF.Max(tr.Y, MathF.Max(bl.Y, br.Y)));
 
-        // Clamp the values to the nearest whole pixel.
-        return Rectangle.FromLTRB(
-            (int)Math.Floor(left),
-            (int)Math.Floor(top),
-            (int)Math.Ceiling(right),
-            (int)Math.Ceiling(bottom));
+        return RectangleF.FromLTRB(left, top, right, bottom);
     }
 
-    private static bool IsAffineRotationOrSkew(Matrix4x4 matrix)
+    /// <summary>
+    /// Normalizes an affine 2D matrix so that it operates in pixel space.
+    /// Applies the row-vector conjugation <c>T(+0.5,+0.5) * M * T(-0.5,-0.5)</c>
+    /// to align the transform with pixel centers.
+    /// </summary>
+    /// <param name="matrix">The affine matrix.</param>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static Matrix3x2 NormalizeToPixel(Matrix3x2 matrix)
     {
-        const float epsilon = 1e-6f;
+        const float dx = 0.5f, dy = 0.5f;
 
-        // Check if the matrix is affine (last column should be [0, 0, 0, 1])
-        if (Math.Abs(matrix.M14) > epsilon ||
-            Math.Abs(matrix.M24) > epsilon ||
-            Math.Abs(matrix.M34) > epsilon ||
-            Math.Abs(matrix.M44 - 1f) > epsilon)
-        {
-            return false;
-        }
-
-        // Translation component (M41, m42) are allowed, others are not.
-        if (Math.Abs(matrix.M43) > epsilon)
-        {
-            return false;
-        }
-
-        // Extract the linear (rotation and skew) part of the matrix
-        // Upper-left 3x3 matrix
-        float m11 = matrix.M11, m12 = matrix.M12, m13 = matrix.M13;
-        float m21 = matrix.M21, m22 = matrix.M22, m23 = matrix.M23;
-        float m31 = matrix.M31, m32 = matrix.M32, m33 = matrix.M33;
+        matrix.M31 += (-dx) + ((dx * matrix.M11) + (dy * matrix.M21));
+        matrix.M32 += (-dy) + ((dx * matrix.M12) + (dy * matrix.M22));
+        return matrix;
+    }
 
-        // Compute the determinant of the linear part
-        float determinant = (m11 * ((m22 * m33) - (m23 * m32))) -
-                            (m12 * ((m21 * m33) - (m23 * m31))) +
-                            (m13 * ((m21 * m32) - (m22 * m31)));
+    /// <summary>
+    /// Normalizes a projective 4×4 matrix so that it operates in pixel space.
+    /// Applies the row-vector conjugation <c>T(+0.5,+0.5,0) * M * T(-0.5,-0.5,0)</c>
+    /// to align the transform with pixel centers.
+    /// </summary>
+    /// <param name="matrix">The projective matrix.</param>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static Matrix4x4 NormalizeToPixel(Matrix4x4 matrix)
+    {
+        const float dx = 0.5f, dy = 0.5f;
 
-        // Check if the determinant is approximately ±1 (no scaling)
-        if (Math.Abs(Math.Abs(determinant) - 1f) > epsilon)
+        // Fast path: affine (no perspective)
+        if (matrix.M14 == 0f && matrix.M24 == 0f && matrix.M34 == 0f && matrix.M44 == 1f)
         {
-            return false;
+            // t' = t + (-d + d·L)
+            matrix.M41 += (-dx) + ((dx * matrix.M11) + (dy * matrix.M21));
+            matrix.M42 += (-dy) + ((dx * matrix.M12) + (dy * matrix.M22));
+            return matrix;
         }
 
-        // All checks passed; the matrix represents rotation and/or skew (with possible translation)
-        return true;
+        Matrix4x4 tPos = Matrix4x4.Identity;
+        tPos.M41 = dx;
+        tPos.M42 = dy;
+        Matrix4x4 tNeg = Matrix4x4.Identity;
+        tNeg.M41 = -dx;
+        tNeg.M42 = -dy;
+        return tPos * matrix * tNeg;
     }
 }
diff --git a/src/ImageSharp/Processing/ProjectiveTransformBuilder.cs b/src/ImageSharp/Processing/ProjectiveTransformBuilder.cs
index 82b897ea5..e40a307a3 100644
--- a/src/ImageSharp/Processing/ProjectiveTransformBuilder.cs
+++ b/src/ImageSharp/Processing/ProjectiveTransformBuilder.cs
@@ -17,24 +17,9 @@ public class ProjectiveTransformBuilder
     /// Initializes a new instance of the <see cref="ProjectiveTransformBuilder"/> class.
     /// </summary>
     public ProjectiveTransformBuilder()
-        : this(TransformSpace.Pixel)
     {
     }
 
-    /// <summary>
-    /// Initializes a new instance of the <see cref="ProjectiveTransformBuilder"/> class.
-    /// </summary>
-    /// <param name="transformSpace">
-    /// The <see cref="TransformSpace"/> to use when applying the projective transform.
-    /// </param>
-    public ProjectiveTransformBuilder(TransformSpace transformSpace)
-        => this.TransformSpace = transformSpace;
-
-    /// <summary>
-    /// Gets the <see cref="TransformSpace"/> to use when applying the projective transform.
-    /// </summary>
-    public TransformSpace TransformSpace { get; }
-
     /// <summary>
     /// Prepends a matrix that performs a tapering projective transform.
     /// </summary>
@@ -43,7 +28,7 @@ public class ProjectiveTransformBuilder
     /// <param name="fraction">The amount to taper.</param>
     /// <returns>The <see cref="ProjectiveTransformBuilder"/>.</returns>
     public ProjectiveTransformBuilder PrependTaper(TaperSide side, TaperCorner corner, float fraction)
-        => this.Prepend(size => TransformUtils.CreateTaperMatrix(size, side, corner, fraction));
+        => this.Prepend(size => TransformUtilities.CreateTaperMatrix(size, side, corner, fraction));
 
     /// <summary>
     /// Appends a matrix that performs a tapering projective transform.
@@ -53,7 +38,7 @@ public class ProjectiveTransformBuilder
     /// <param name="fraction">The amount to taper.</param>
     /// <returns>The <see cref="ProjectiveTransformBuilder"/>.</returns>
     public ProjectiveTransformBuilder AppendTaper(TaperSide side, TaperCorner corner, float fraction)
-        => this.Append(size => TransformUtils.CreateTaperMatrix(size, side, corner, fraction));
+        => this.Append(size => TransformUtilities.CreateTaperMatrix(size, side, corner, fraction));
 
     /// <summary>
     /// Prepends a centered rotation matrix using the given rotation in degrees.
@@ -69,7 +54,7 @@ public class ProjectiveTransformBuilder
     /// <param name="radians">The amount of rotation, in radians.</param>
     /// <returns>The <see cref="ProjectiveTransformBuilder"/>.</returns>
     public ProjectiveTransformBuilder PrependRotationRadians(float radians)
-        => this.Prepend(size => new Matrix4x4(TransformUtils.CreateRotationTransformMatrixRadians(radians, size, this.TransformSpace)));
+        => this.Prepend(size => new Matrix4x4(TransformUtilities.CreateRotationTransformMatrixRadians(radians, size)));
 
     /// <summary>
     /// Prepends a centered rotation matrix using the given rotation in degrees at the given origin.
@@ -87,7 +72,8 @@ public class ProjectiveTransformBuilder
     /// <param name="origin">The rotation origin point.</param>
     /// <returns>The <see cref="ProjectiveTransformBuilder"/>.</returns>
     internal ProjectiveTransformBuilder PrependRotationRadians(float radians, Vector2 origin)
-        => this.PrependMatrix(Matrix4x4.CreateRotationZ(radians, new Vector3(origin, 0)));
+        => this.PrependMatrix(
+            Matrix4x4.CreateRotationZ(radians, new Vector3(origin, 0)));
 
     /// <summary>
     /// Appends a centered rotation matrix using the given rotation in degrees.
@@ -103,7 +89,7 @@ public class ProjectiveTransformBuilder
     /// <param name="radians">The amount of rotation, in radians.</param>
     /// <returns>The <see cref="ProjectiveTransformBuilder"/>.</returns>
     public ProjectiveTransformBuilder AppendRotationRadians(float radians)
-        => this.Append(size => new Matrix4x4(TransformUtils.CreateRotationTransformMatrixRadians(radians, size, this.TransformSpace)));
+        => this.Append(size => new Matrix4x4(TransformUtilities.CreateRotationTransformMatrixRadians(radians, size)));
 
     /// <summary>
     /// Appends a centered rotation matrix using the given rotation in degrees at the given origin.
@@ -187,7 +173,7 @@ public class ProjectiveTransformBuilder
     /// <param name="radiansY">The Y angle, in radians.</param>
     /// <returns>The <see cref="ProjectiveTransformBuilder"/>.</returns>
     public ProjectiveTransformBuilder PrependSkewRadians(float radiansX, float radiansY)
-        => this.Prepend(size => new Matrix4x4(TransformUtils.CreateSkewTransformMatrixRadians(radiansX, radiansY, size, this.TransformSpace)));
+        => this.Prepend(size => new Matrix4x4(TransformUtilities.CreateSkewTransformMatrixRadians(radiansX, radiansY, size)));
 
     /// <summary>
     /// Prepends a skew matrix using the given angles in degrees at the given origin.
@@ -225,7 +211,7 @@ public class ProjectiveTransformBuilder
     /// <param name="radiansY">The Y angle, in radians.</param>
     /// <returns>The <see cref="ProjectiveTransformBuilder"/>.</returns>
     public ProjectiveTransformBuilder AppendSkewRadians(float radiansX, float radiansY)
-        => this.Append(size => new Matrix4x4(TransformUtils.CreateSkewTransformMatrixRadians(radiansX, radiansY, size, this.TransformSpace)));
+        => this.Append(size => new Matrix4x4(TransformUtilities.CreateSkewTransformMatrixRadians(radiansX, radiansY, size)));
 
     /// <summary>
     /// Appends a skew matrix using the given angles in degrees at the given origin.
@@ -288,8 +274,12 @@ public class ProjectiveTransformBuilder
     /// <param name="bottomLeft">The bottom-left corner point of the distorted quad.</param>
     /// <returns>The <see cref="ProjectiveTransformBuilder"/>.</returns>
     public ProjectiveTransformBuilder PrependQuadDistortion(PointF topLeft, PointF topRight, PointF bottomRight, PointF bottomLeft)
-        => this.Prepend(size => TransformUtils.CreateQuadDistortionMatrix(
-            new Rectangle(Point.Empty, size), topLeft, topRight, bottomRight, bottomLeft, this.TransformSpace));
+        => this.Prepend(size => TransformUtilities.CreateQuadDistortionMatrix(
+            new Rectangle(Point.Empty, size),
+            topLeft,
+            topRight,
+            bottomRight,
+            bottomLeft));
 
     /// <summary>
     /// Appends a quad distortion matrix using the specified corner points.
@@ -300,8 +290,12 @@ public class ProjectiveTransformBuilder
     /// <param name="bottomLeft">The bottom-left corner point of the distorted quad.</param>
     /// <returns>The <see cref="ProjectiveTransformBuilder"/>.</returns>
     public ProjectiveTransformBuilder AppendQuadDistortion(PointF topLeft, PointF topRight, PointF bottomRight, PointF bottomLeft)
-        => this.Append(size => TransformUtils.CreateQuadDistortionMatrix(
-            new Rectangle(Point.Empty, size), topLeft, topRight, bottomRight, bottomLeft, this.TransformSpace));
+        => this.Append(size => TransformUtilities.CreateQuadDistortionMatrix(
+            new Rectangle(Point.Empty, size),
+            topLeft,
+            topRight,
+            bottomRight,
+            bottomLeft));
 
     /// <summary>
     /// Prepends a raw matrix.
@@ -383,15 +377,29 @@ public class ProjectiveTransformBuilder
     /// for linear transforms.
     /// </exception>
     /// <returns>The <see cref="Size"/>.</returns>
-    public Size GetTransformedSize(Rectangle sourceRectangle)
+    public SizeF GetTransformedSize(Rectangle sourceRectangle)
     {
         Matrix4x4 matrix = this.BuildMatrix(sourceRectangle);
-        return TransformUtils.GetTransformedSize(matrix, sourceRectangle.Size, this.TransformSpace);
+        return GetTransformedSize(sourceRectangle, matrix);
     }
 
+    /// <summary>
+    /// Returns the size of a rectangle large enough to contain the transformed source rectangle.
+    /// </summary>
+    /// <param name="sourceRectangle">The rectangle in the source image.</param>
+    /// <param name="matrix">The transformation matrix.</param>
+    /// <exception cref="DegenerateTransformException">
+    /// The resultant matrix is degenerate containing one or more values equivalent
+    /// to <see cref="float.NaN"/> or a zero determinant and therefore cannot be used
+    /// for linear transforms.
+    /// </exception>
+    /// <returns>The <see cref="Size"/>.</returns>
+    internal static SizeF GetTransformedSize(Rectangle sourceRectangle, Matrix4x4 matrix)
+        => TransformUtilities.GetRawTransformedSize(matrix, sourceRectangle.Size);
+
     private static void CheckDegenerate(Matrix4x4 matrix)
     {
-        if (TransformUtils.IsDegenerate(matrix))
+        if (TransformUtilities.IsDegenerate(matrix))
         {
             throw new DegenerateTransformException("Matrix is degenerate. Check input values.");
         }
diff --git a/src/ImageSharp/Processing/TransformSpace.cs b/src/ImageSharp/Processing/TransformSpace.cs
deleted file mode 100644
index bca676bd8..000000000
--- a/src/ImageSharp/Processing/TransformSpace.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-namespace SixLabors.ImageSharp.Processing;
-
-/// <summary>
-/// Represents the different spaces used in transformation operations.
-/// </summary>
-public enum TransformSpace
-{
-    /// <summary>
-    /// Coordinate space is a continuous, mathematical grid where objects and positions
-    /// are defined with precise, often fractional values. This space allows for fine-grained
-    /// transformations like scaling, rotation, and translation with high precision.
-    /// In coordinate space, an image can span from (0,0) to (4,4) for a 4x4 image, including the boundaries.
-    /// </summary>
-    Coordinate,
-
-    /// <summary>
-    /// Pixel space is a discrete grid where each position corresponds to a specific pixel on the screen.
-    /// In this space, positions are defined by whole numbers, with no fractional values.
-    /// A 4x4 image in pixel space covers exactly 4 pixels wide and 4 pixels tall, ranging from (0,0) to (3,3).
-    /// Pixel space is used when rendering images to ensure that everything aligns with the actual pixels on the screen.
-    /// </summary>
-    Pixel
-}
diff --git a/tests/Directory.Build.targets b/tests/Directory.Build.targets
index e20717cdd..8c88ff647 100644
--- a/tests/Directory.Build.targets
+++ b/tests/Directory.Build.targets
@@ -25,7 +25,7 @@
     See https://github.com/ImageMagick/ImageMagick/commit/27a0a9c37f18af9c8d823a3ea076f600843b553c
     -->
     <PackageReference Update="Magick.NET-Q16-AnyCPU" Version="13.10.0" />
-    <PackageReference Update="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23580.1" />
+    <PackageReference Update="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25563.105" />
     <PackageReference Update="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23580.1" />
     <PackageReference Update="Moq" Version="4.20.72" />
     <PackageReference Update="NetVips" Version="3.0.0" />
diff --git a/tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.csproj b/tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.csproj
index c92bb6a6b..2628623b4 100644
--- a/tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.csproj
+++ b/tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.csproj
@@ -19,7 +19,7 @@
     BenchmarkDotNet requires a certain structure to the code,
     as such, some of these rules cannot be implemented.
     -->
-    
+
     <!--Mark members as static-->
     <!--Validate platform compatibility-->
     <!--Types that own disposable fields should be disposable-->
@@ -39,7 +39,7 @@
   <Choose>
     <When Condition="$(SIXLABORS_TESTING_PREVIEW) == true">
       <PropertyGroup>
-        <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+        <TargetFrameworks>net8.0;net10.0</TargetFrameworks>
       </PropertyGroup>
     </When>
     <Otherwise>
diff --git a/tests/ImageSharp.Tests.ProfilingSandbox/ImageSharp.Tests.ProfilingSandbox.csproj b/tests/ImageSharp.Tests.ProfilingSandbox/ImageSharp.Tests.ProfilingSandbox.csproj
index 832f3d171..bc52610d2 100644
--- a/tests/ImageSharp.Tests.ProfilingSandbox/ImageSharp.Tests.ProfilingSandbox.csproj
+++ b/tests/ImageSharp.Tests.ProfilingSandbox/ImageSharp.Tests.ProfilingSandbox.csproj
@@ -19,7 +19,7 @@
   <Choose>
     <When Condition="$(SIXLABORS_TESTING_PREVIEW) == true">
       <PropertyGroup>
-        <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+        <TargetFrameworks>net8.0;net10.0</TargetFrameworks>
       </PropertyGroup>
     </When>
     <Otherwise>
diff --git a/tests/ImageSharp.Tests/Common/SimdUtilsTests.Shuffle.cs b/tests/ImageSharp.Tests/Common/SimdUtilsTests.Shuffle.cs
index ba37ee166..81daac3e0 100644
--- a/tests/ImageSharp.Tests/Common/SimdUtilsTests.Shuffle.cs
+++ b/tests/ImageSharp.Tests/Common/SimdUtilsTests.Shuffle.cs
@@ -292,7 +292,7 @@ public partial class SimdUtilsTests
         FeatureTestRunner.RunWithHwIntrinsicsFeature(
             RunTest,
             count,
-            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX | HwIntrinsics.DisableSSE);
+            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX | HwIntrinsics.DisableHWIntrinsic);
     }
 
     [Theory]
@@ -352,7 +352,7 @@ public partial class SimdUtilsTests
         FeatureTestRunner.RunWithHwIntrinsicsFeature(
             RunTest,
             count,
-            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE);
+            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableHWIntrinsic);
     }
 
     [Theory]
@@ -394,7 +394,7 @@ public partial class SimdUtilsTests
         FeatureTestRunner.RunWithHwIntrinsicsFeature(
             RunTest,
             count,
-            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE);
+            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableHWIntrinsic);
     }
 
     [Theory]
@@ -436,7 +436,7 @@ public partial class SimdUtilsTests
         FeatureTestRunner.RunWithHwIntrinsicsFeature(
             RunTest,
             count,
-            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE);
+            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableHWIntrinsic);
     }
 
     [Theory]
@@ -478,7 +478,7 @@ public partial class SimdUtilsTests
         FeatureTestRunner.RunWithHwIntrinsicsFeature(
             RunTest,
             count,
-            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX | HwIntrinsics.DisableSSE);
+            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX | HwIntrinsics.DisableHWIntrinsic);
     }
 
     private static void TestShuffleFloat4Channel(
diff --git a/tests/ImageSharp.Tests/Common/SimdUtilsTests.cs b/tests/ImageSharp.Tests/Common/SimdUtilsTests.cs
index 36b301264..e39f9456f 100644
--- a/tests/ImageSharp.Tests/Common/SimdUtilsTests.cs
+++ b/tests/ImageSharp.Tests/Common/SimdUtilsTests.cs
@@ -133,7 +133,7 @@ public partial class SimdUtilsTests
         FeatureTestRunner.RunWithHwIntrinsicsFeature(
             RunTest,
             count,
-            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX512F | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE41);
+            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX512 | HwIntrinsics.DisableAVX2);
     }
 
     [Theory]
@@ -171,7 +171,7 @@ public partial class SimdUtilsTests
         FeatureTestRunner.RunWithHwIntrinsicsFeature(
             RunTest,
             count,
-            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX512BW | HwIntrinsics.DisableAVX2);
+            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX512 | HwIntrinsics.DisableAVX2);
     }
 
     [Theory]
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/Block8x8FTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/Block8x8FTests.cs
index ab205c8a3..368a7b369 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/Block8x8FTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/Block8x8FTests.cs
@@ -267,7 +267,7 @@ public partial class Block8x8FTests : JpegFixture
             RunTest,
             srcSeed,
             qtSeed,
-            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX | HwIntrinsics.DisableSSE);
+            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX | HwIntrinsics.DisableHWIntrinsic);
     }
 
     [Fact]
@@ -462,7 +462,7 @@ public partial class Block8x8FTests : JpegFixture
         // 3. DisableAvx2 - call fallback code of float implementation
         FeatureTestRunner.RunWithHwIntrinsicsFeature(
             RunTest,
-            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX | HwIntrinsics.DisableSSE);
+            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX | HwIntrinsics.DisableHWIntrinsic);
     }
 
     [Theory]
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/DCTTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/DCTTests.cs
index 062a8a5ee..50eada4c7 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/DCTTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/DCTTests.cs
@@ -152,7 +152,7 @@ public static class DCTTests
             FeatureTestRunner.RunWithHwIntrinsicsFeature(
                 RunTest,
                 seed,
-                HwIntrinsics.AllowAll | HwIntrinsics.DisableFMA | HwIntrinsics.DisableAVX | HwIntrinsics.DisableHWIntrinsic);
+                HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX | HwIntrinsics.DisableHWIntrinsic);
         }
 
         [Theory]
@@ -352,15 +352,14 @@ public static class DCTTests
                 Assert.Equal(expectedDest, actualDest, new ApproximateFloatComparer(1f));
             }
 
-            // 4 paths:
-            // 1. AllowAll - call avx/fma implementation
-            // 2. DisableFMA - call avx without fma implementation
-            // 3. DisableAvx - call Vector4 implementation
-            // 4. DisableHWIntrinsic - call scalar fallback implementation
+            // 3 paths:
+            // 1. AllowAll - call avx implementation
+            // 2. DisableAvx - call Vector4 implementation
+            // 3. DisableHWIntrinsic - call scalar fallback implementation
             FeatureTestRunner.RunWithHwIntrinsicsFeature(
                 RunTest,
                 seed,
-                HwIntrinsics.AllowAll | HwIntrinsics.DisableFMA | HwIntrinsics.DisableAVX | HwIntrinsics.DisableHWIntrinsic);
+                HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX | HwIntrinsics.DisableHWIntrinsic);
         }
     }
 }
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegColorConverterTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegColorConverterTests.cs
index d58ff9823..8d94fb5cf 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/JpegColorConverterTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegColorConverterTests.cs
@@ -19,12 +19,8 @@ public class JpegColorConverterTests
 
     private const int TestBufferLength = 40;
 
-    private const HwIntrinsics IntrinsicsConfig = HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX512F | HwIntrinsics.DisableAVX2;
-
     private static readonly ApproximateColorProfileComparer ColorSpaceComparer = new(epsilon: Precision);
 
-    private static readonly ColorProfileConverter ColorSpaceConverter = new();
-
     public static readonly TheoryData<int> Seeds = new() { 1, 2, 3 };
 
     public JpegColorConverterTests(ITestOutputHelper output)
@@ -73,7 +69,7 @@ public class JpegColorConverterTests
     {
         FeatureTestRunner.RunWithHwIntrinsicsFeature(
             RunTest,
-            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX512F | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE2 | HwIntrinsics.DisableHWIntrinsic);
+            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX512 | HwIntrinsics.DisableAVX | HwIntrinsics.DisableHWIntrinsic);
 
         static void RunTest(string arg)
         {
@@ -106,7 +102,7 @@ public class JpegColorConverterTests
     {
         FeatureTestRunner.RunWithHwIntrinsicsFeature(
             RunTest,
-            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX512F | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE2 | HwIntrinsics.DisableHWIntrinsic);
+            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX512 | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableHWIntrinsic);
 
         static void RunTest(string arg)
         {
@@ -139,7 +135,7 @@ public class JpegColorConverterTests
     {
         FeatureTestRunner.RunWithHwIntrinsicsFeature(
             RunTest,
-            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE2 | HwIntrinsics.DisableHWIntrinsic);
+            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableHWIntrinsic);
 
         static void RunTest(string arg)
         {
@@ -172,7 +168,7 @@ public class JpegColorConverterTests
     {
         FeatureTestRunner.RunWithHwIntrinsicsFeature(
             RunTest,
-            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX512F | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE2 | HwIntrinsics.DisableHWIntrinsic);
+            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX512 | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableHWIntrinsic);
 
         static void RunTest(string arg)
         {
@@ -205,7 +201,7 @@ public class JpegColorConverterTests
     {
         FeatureTestRunner.RunWithHwIntrinsicsFeature(
             RunTest,
-            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX512F | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE2 | HwIntrinsics.DisableHWIntrinsic);
+            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX512 | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableHWIntrinsic);
 
         static void RunTest(string arg)
         {
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs
index 71753bf9c..3fd55eb91 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs
@@ -417,4 +417,20 @@ public partial class JpegDecoderTests
         image.DebugSave(provider);
         image.CompareToReferenceOutput(provider);
     }
+
+    // https://github.com/SixLabors/ImageSharp/issues/2948
+    [Theory]
+    [WithFile(TestImages.Jpeg.Issues.Issue2948, PixelTypes.Rgb24)]
+    public void Issue2948_No_SOS_Decode_Throws_InvalidImageContentException<TPixel>(TestImageProvider<TPixel> provider)
+        where TPixel : unmanaged, IPixel<TPixel>
+        => Assert.Throws<InvalidImageContentException>(() =>
+        {
+            using Image<TPixel> image = provider.GetImage(JpegDecoder.Instance);
+        });
+
+    // https://github.com/SixLabors/ImageSharp/issues/2948
+    [Theory]
+    [InlineData(TestImages.Jpeg.Issues.Issue2948)]
+    public void Issue2948_No_SOS_Identify_Throws_InvalidImageContentException(string imagePath)
+        => Assert.Throws<InvalidImageContentException>(() => _ = Image.Identify(TestFile.Create(imagePath).Bytes));
 }
diff --git a/tests/ImageSharp.Tests/Formats/Png/PngDecoderFilterTests.cs b/tests/ImageSharp.Tests/Formats/Png/PngDecoderFilterTests.cs
index 00db13d4b..6616b0477 100644
--- a/tests/ImageSharp.Tests/Formats/Png/PngDecoderFilterTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Png/PngDecoderFilterTests.cs
@@ -171,7 +171,7 @@ public class PngDecoderFilterTests
     public void PaethFilter_WithHardwareIntrinsics_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunPaethFilterTest, HwIntrinsics.AllowAll);
 
     [Fact]
-    public void PaethFilter_WithoutSsse3_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunPaethFilterTest, HwIntrinsics.DisableSSSE3);
+    public void PaethFilter_WithoutSsse3_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunPaethFilterTest, HwIntrinsics.DisableHWIntrinsic);
 
     [Fact]
     public void PaethFilter_WithoutHardwareIntrinsics_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunPaethFilterTest, HwIntrinsics.DisableHWIntrinsic);
diff --git a/tests/ImageSharp.Tests/Formats/Png/PngEncoderFilterTests.cs b/tests/ImageSharp.Tests/Formats/Png/PngEncoderFilterTests.cs
index a930426b6..3a31b395f 100644
--- a/tests/ImageSharp.Tests/Formats/Png/PngEncoderFilterTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Png/PngEncoderFilterTests.cs
@@ -51,7 +51,7 @@ public class PngEncoderFilterTests : MeasureFixture
 
         FeatureTestRunner.RunWithHwIntrinsicsFeature(
             RunTest,
-            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSSE3);
+            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableHWIntrinsic);
     }
 
     [Fact]
diff --git a/tests/ImageSharp.Tests/Formats/Png/PngEncoderTests.cs b/tests/ImageSharp.Tests/Formats/Png/PngEncoderTests.cs
index 0d666d8c8..4ebcbc13b 100644
--- a/tests/ImageSharp.Tests/Formats/Png/PngEncoderTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Png/PngEncoderTests.cs
@@ -618,7 +618,7 @@ public partial class PngEncoderTests
 
         FeatureTestRunner.RunWithHwIntrinsicsFeature(
             RunTest,
-            HwIntrinsics.DisableSSSE3,
+            HwIntrinsics.DisableHWIntrinsic,
             provider);
     }
 
diff --git a/tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderTests.cs b/tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderTests.cs
index 26dc4f587..d850c67a5 100644
--- a/tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderTests.cs
@@ -360,7 +360,9 @@ public class TiffDecoderTests : TiffDecoderBaseTester
     {
         using Image<TPixel> image = provider.GetImage(TiffDecoder.Instance);
         image.DebugSave(provider);
-        image.CompareToReferenceOutput(ImageComparer.Exact, provider);
+
+        // ARM reports a 0.0000% difference, so we use a tolerant comparer here.
+        image.CompareToReferenceOutput(ImageComparer.TolerantPercentage(0.0001F), provider);
     }
 
     [Theory]
@@ -783,7 +785,7 @@ public class TiffDecoderTests : TiffDecoderBaseTester
         // ImageMagick cannot decode this image.
         image.DebugSave(provider);
         image.CompareToReferenceOutput(
-            ImageComparer.TolerantPercentage(0.0018F), // NET 9+ Uses zlib-ng to decompress, which manages to decode 2 extra pixels.
+            ImageComparer.TolerantPercentage(0.0034F), // NET 10 Uses zlib-ng to decompress, which manages to decode 3 extra pixels.
             provider,
             appendPixelTypeToFileName: false);
     }
diff --git a/tests/ImageSharp.Tests/Formats/WebP/ColorSpaceTransformUtilsTests.cs b/tests/ImageSharp.Tests/Formats/WebP/ColorSpaceTransformUtilsTests.cs
index 66f320143..9657859e0 100644
--- a/tests/ImageSharp.Tests/Formats/WebP/ColorSpaceTransformUtilsTests.cs
+++ b/tests/ImageSharp.Tests/Formats/WebP/ColorSpaceTransformUtilsTests.cs
@@ -71,7 +71,7 @@ public class ColorSpaceTransformUtilsTests
     public void CollectColorBlueTransforms_WithHardwareIntrinsics_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunCollectColorBlueTransformsTest, HwIntrinsics.AllowAll);
 
     [Fact]
-    public void CollectColorBlueTransforms_WithoutVector128_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunCollectColorBlueTransformsTest, HwIntrinsics.DisableSSE41);
+    public void CollectColorBlueTransforms_WithoutVector128_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunCollectColorBlueTransformsTest, HwIntrinsics.DisableHWIntrinsic);
 
     [Fact]
     public void CollectColorBlueTransforms_WithoutVector256_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunCollectColorBlueTransformsTest, HwIntrinsics.DisableAVX2);
@@ -80,7 +80,7 @@ public class ColorSpaceTransformUtilsTests
     public void CollectColorRedTransforms_WithHardwareIntrinsics_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunCollectColorRedTransformsTest, HwIntrinsics.AllowAll);
 
     [Fact]
-    public void CollectColorRedTransforms_WithoutVector128_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunCollectColorRedTransformsTest, HwIntrinsics.DisableSSE41);
+    public void CollectColorRedTransforms_WithoutVector128_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunCollectColorRedTransformsTest, HwIntrinsics.DisableHWIntrinsic);
 
     [Fact]
     public void CollectColorRedTransforms_WithoutVector256_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunCollectColorRedTransformsTest, HwIntrinsics.DisableAVX2);
diff --git a/tests/ImageSharp.Tests/Formats/WebP/LosslessUtilsTests.cs b/tests/ImageSharp.Tests/Formats/WebP/LosslessUtilsTests.cs
index 982f0a5d5..4dcccb1a3 100644
--- a/tests/ImageSharp.Tests/Formats/WebP/LosslessUtilsTests.cs
+++ b/tests/ImageSharp.Tests/Formats/WebP/LosslessUtilsTests.cs
@@ -304,19 +304,19 @@ public class LosslessUtilsTests
     public void Predictor11_WithHardwareIntrinsics_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunPredictor11Test, HwIntrinsics.AllowAll);
 
     [Fact]
-    public void Predictor11_WithoutSSE2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunPredictor11Test, HwIntrinsics.DisableSSE2);
+    public void Predictor11_WithoutSSE2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunPredictor11Test, HwIntrinsics.DisableHWIntrinsic);
 
     [Fact]
     public void Predictor12_WithHardwareIntrinsics_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunPredictor12Test, HwIntrinsics.AllowAll);
 
     [Fact]
-    public void Predictor12_WithoutSSE2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunPredictor12Test, HwIntrinsics.DisableSSE2);
+    public void Predictor12_WithoutSSE2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunPredictor12Test, HwIntrinsics.DisableHWIntrinsic);
 
     [Fact]
     public void Predictor13_WithHardwareIntrinsics_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunPredictor13Test, HwIntrinsics.AllowAll);
 
     [Fact]
-    public void Predictor13_WithoutSSE2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunPredictor13Test, HwIntrinsics.DisableSSE2);
+    public void Predictor13_WithoutSSE2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunPredictor13Test, HwIntrinsics.DisableHWIntrinsic);
 
     [Fact]
     public void SubtractGreen_Works() => RunSubtractGreenTest();
@@ -331,7 +331,7 @@ public class LosslessUtilsTests
     public void SubtractGreen_Scalar_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunSubtractGreenTest, HwIntrinsics.DisableHWIntrinsic);
 
     [Fact]
-    public void SubtractGreen_WithoutAvxOrSSSE3_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunSubtractGreenTest, HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSSE3);
+    public void SubtractGreen_WithoutAvxOrSSSE3_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunSubtractGreenTest, HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableHWIntrinsic);
 
     [Fact]
     public void AddGreenToBlueAndRed_WithHardwareIntrinsics_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunAddGreenToBlueAndRedTest, HwIntrinsics.AllowAll);
@@ -340,13 +340,13 @@ public class LosslessUtilsTests
     public void AddGreenToBlueAndRed_WithoutAVX2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunAddGreenToBlueAndRedTest, HwIntrinsics.DisableAVX2);
 
     [Fact]
-    public void AddGreenToBlueAndRed_WithoutAVX2OrSSSE3_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunAddGreenToBlueAndRedTest, HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE2 | HwIntrinsics.DisableSSSE3);
+    public void AddGreenToBlueAndRed_WithoutAVX2OrSSSE3_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunAddGreenToBlueAndRedTest, HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableHWIntrinsic);
 
     [Fact]
     public void TransformColor_WithHardwareIntrinsics_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunTransformColorTest, HwIntrinsics.AllowAll);
 
     [Fact]
-    public void TransformColor_WithoutSSE2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunTransformColorTest, HwIntrinsics.DisableSSE2);
+    public void TransformColor_WithoutSSE2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunTransformColorTest, HwIntrinsics.DisableHWIntrinsic);
 
     [Fact]
     public void TransformColor_WithoutAVX2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunTransformColorTest, HwIntrinsics.DisableAVX2);
@@ -355,7 +355,7 @@ public class LosslessUtilsTests
     public void TransformColorInverse_WithHardwareIntrinsics_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunTransformColorInverseTest, HwIntrinsics.AllowAll);
 
     [Fact]
-    public void TransformColorInverse_WithoutSSE2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunTransformColorInverseTest, HwIntrinsics.DisableSSE2);
+    public void TransformColorInverse_WithoutSSE2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunTransformColorInverseTest, HwIntrinsics.DisableHWIntrinsic);
 
     [Fact]
     public void TransformColorInverse_WithoutAVX2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunTransformColorInverseTest, HwIntrinsics.DisableAVX2);
diff --git a/tests/ImageSharp.Tests/Formats/WebP/PredictorEncoderTests.cs b/tests/ImageSharp.Tests/Formats/WebP/PredictorEncoderTests.cs
index 23ef8e7b1..16990c357 100644
--- a/tests/ImageSharp.Tests/Formats/WebP/PredictorEncoderTests.cs
+++ b/tests/ImageSharp.Tests/Formats/WebP/PredictorEncoderTests.cs
@@ -24,7 +24,7 @@ public class PredictorEncoderTests
 
     [Fact]
     public void ColorSpaceTransform_WithPeakImage_WithoutSSE41_Works()
-        => FeatureTestRunner.RunWithHwIntrinsicsFeature(ColorSpaceTransform_WithPeakImage_ProducesExpectedData, HwIntrinsics.DisableSSE41);
+        => FeatureTestRunner.RunWithHwIntrinsicsFeature(ColorSpaceTransform_WithPeakImage_ProducesExpectedData, HwIntrinsics.DisableHWIntrinsic);
 
     [Fact]
     public void ColorSpaceTransform_WithBikeImage_WithHardwareIntrinsics_Works()
@@ -32,7 +32,7 @@ public class PredictorEncoderTests
 
     [Fact]
     public void ColorSpaceTransform_WithBikeImage_WithoutSSE41_Works()
-        => FeatureTestRunner.RunWithHwIntrinsicsFeature(ColorSpaceTransform_WithBikeImage_ProducesExpectedData, HwIntrinsics.DisableSSE41);
+        => FeatureTestRunner.RunWithHwIntrinsicsFeature(ColorSpaceTransform_WithBikeImage_ProducesExpectedData, HwIntrinsics.DisableHWIntrinsic);
 
     [Fact]
     public void ColorSpaceTransform_WithBikeImage_WithoutAvx2_Works()
diff --git a/tests/ImageSharp.Tests/Formats/WebP/QuantEncTests.cs b/tests/ImageSharp.Tests/Formats/WebP/QuantEncTests.cs
index fc7da8cf6..3808ba6d0 100644
--- a/tests/ImageSharp.Tests/Formats/WebP/QuantEncTests.cs
+++ b/tests/ImageSharp.Tests/Formats/WebP/QuantEncTests.cs
@@ -45,7 +45,7 @@ public class QuantEncTests
     public void QuantizeBlock_WithHardwareIntrinsics_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunQuantizeBlockTest, HwIntrinsics.AllowAll);
 
     [Fact]
-    public void QuantizeBlock_WithoutSSE2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunQuantizeBlockTest, HwIntrinsics.DisableSSE2);
+    public void QuantizeBlock_WithoutSSE2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunQuantizeBlockTest, HwIntrinsics.DisableHWIntrinsic);
 
     [Fact]
     public void QuantizeBlock_WithoutAVX2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunQuantizeBlockTest, HwIntrinsics.DisableAVX2);
diff --git a/tests/ImageSharp.Tests/Formats/WebP/Vp8ResidualTests.cs b/tests/ImageSharp.Tests/Formats/WebP/Vp8ResidualTests.cs
index 62c67c2e0..2a0821108 100644
--- a/tests/ImageSharp.Tests/Formats/WebP/Vp8ResidualTests.cs
+++ b/tests/ImageSharp.Tests/Formats/WebP/Vp8ResidualTests.cs
@@ -252,5 +252,5 @@ public class Vp8ResidualTests
     public void SetCoeffsTest_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunSetCoeffsTest, HwIntrinsics.AllowAll);
 
     [Fact]
-    public void SetCoeffsTest_WithoutSSE2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunSetCoeffsTest, HwIntrinsics.DisableSSE2);
+    public void SetCoeffsTest_WithoutSSE2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunSetCoeffsTest, HwIntrinsics.DisableHWIntrinsic);
 }
diff --git a/tests/ImageSharp.Tests/Formats/WebP/WebpCommonUtilsTests.cs b/tests/ImageSharp.Tests/Formats/WebP/WebpCommonUtilsTests.cs
index ca1859e54..3962d4f37 100644
--- a/tests/ImageSharp.Tests/Formats/WebP/WebpCommonUtilsTests.cs
+++ b/tests/ImageSharp.Tests/Formats/WebP/WebpCommonUtilsTests.cs
@@ -23,7 +23,7 @@ public class WebpCommonUtilsTests
 
     [Fact]
     public void CheckNonOpaque_WithOpaquePixels_WithoutSse2_Works()
-        => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunCheckNoneOpaqueWithOpaquePixelsTest, HwIntrinsics.DisableSSE2);
+        => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunCheckNoneOpaqueWithOpaquePixelsTest, HwIntrinsics.DisableHWIntrinsic);
 
     [Fact]
     public void CheckNonOpaque_WithOpaquePixels_WithoutAvx2_Works()
@@ -35,7 +35,7 @@ public class WebpCommonUtilsTests
 
     [Fact]
     public void CheckNonOpaque_WithNoneOpaquePixels_WithoutSse2_Works()
-        => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunCheckNoneOpaqueWithNoneOpaquePixelsTest, HwIntrinsics.DisableSSE2);
+        => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunCheckNoneOpaqueWithNoneOpaquePixelsTest, HwIntrinsics.DisableHWIntrinsic);
 
     [Fact]
     public void CheckNonOpaque_WithNoneOpaquePixels_WithoutAvx2_Works()
diff --git a/tests/ImageSharp.Tests/Formats/WebP/YuvConversionTests.cs b/tests/ImageSharp.Tests/Formats/WebP/YuvConversionTests.cs
index e86642fea..482c41b25 100644
--- a/tests/ImageSharp.Tests/Formats/WebP/YuvConversionTests.cs
+++ b/tests/ImageSharp.Tests/Formats/WebP/YuvConversionTests.cs
@@ -32,7 +32,7 @@ public class YuvConversionTests
     public void UpSampleYuvToRgb_WithHardwareIntrinsics_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunUpSampleYuvToRgbTest, HwIntrinsics.AllowAll);
 
     [Fact]
-    public void UpSampleYuvToRgb_WithoutSSE2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunUpSampleYuvToRgbTest, HwIntrinsics.DisableSSE2);
+    public void UpSampleYuvToRgb_WithoutSSE2_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunUpSampleYuvToRgbTest, HwIntrinsics.DisableHWIntrinsic);
 
     [Theory]
     [WithFile(TestImages.Webp.Yuv, PixelTypes.Rgba32)]
diff --git a/tests/ImageSharp.Tests/Image/ImageTests.DetectFormat.cs b/tests/ImageSharp.Tests/Image/ImageTests.DetectFormat.cs
index a1966e2bb..178f5375f 100644
--- a/tests/ImageSharp.Tests/Image/ImageTests.DetectFormat.cs
+++ b/tests/ImageSharp.Tests/Image/ImageTests.DetectFormat.cs
@@ -50,6 +50,10 @@ public partial class ImageTests
             Assert.Equal(this.LocalImageFormat, format);
         }
 
+        [Fact]
+        public void FromBytes_EmptySpan_Throws()
+            => Assert.Throws<UnknownImageFormatException>(() => Image.DetectFormat([]));
+
         [Fact]
         public void FromFileSystemPath_GlobalConfiguration()
         {
diff --git a/tests/ImageSharp.Tests/Image/ImageTests.Identify.cs b/tests/ImageSharp.Tests/Image/ImageTests.Identify.cs
index 490fa3b0b..433a1e101 100644
--- a/tests/ImageSharp.Tests/Image/ImageTests.Identify.cs
+++ b/tests/ImageSharp.Tests/Image/ImageTests.Identify.cs
@@ -38,6 +38,10 @@ public partial class ImageTests
             Assert.Equal(ExpectedGlobalFormat, info.Metadata.DecodedImageFormat);
         }
 
+        [Fact]
+        public void FromBytes_EmptySpan_Throws()
+            => Assert.Throws<UnknownImageFormatException>(() => Image.Identify([]));
+
         [Fact]
         public void FromBytes_CustomConfiguration()
         {
diff --git a/tests/ImageSharp.Tests/Image/ImageTests.Load_FromBytes_PassLocalConfiguration.cs b/tests/ImageSharp.Tests/Image/ImageTests.Load_FromBytes_PassLocalConfiguration.cs
index 3a47a0ea7..600bed010 100644
--- a/tests/ImageSharp.Tests/Image/ImageTests.Load_FromBytes_PassLocalConfiguration.cs
+++ b/tests/ImageSharp.Tests/Image/ImageTests.Load_FromBytes_PassLocalConfiguration.cs
@@ -79,5 +79,16 @@ public partial class ImageTests
 
             this.TestFormat.VerifyAgnosticDecodeCall(this.Marker, this.TopLevelConfiguration);
         }
+
+        [Fact]
+        public void FromBytes_EmptySpan_Throws()
+        {
+            DecoderOptions options = new()
+            {
+                Configuration = this.TopLevelConfiguration
+            };
+
+            Assert.Throws<UnknownImageFormatException>(() => Image.Load(options, []));
+        }
     }
 }
diff --git a/tests/ImageSharp.Tests/Image/ImageTests.Load_FromBytes_UseGlobalConfiguration.cs b/tests/ImageSharp.Tests/Image/ImageTests.Load_FromBytes_UseGlobalConfiguration.cs
index 00ec985ac..a0ce1e5d8 100644
--- a/tests/ImageSharp.Tests/Image/ImageTests.Load_FromBytes_UseGlobalConfiguration.cs
+++ b/tests/ImageSharp.Tests/Image/ImageTests.Load_FromBytes_UseGlobalConfiguration.cs
@@ -45,5 +45,9 @@ public partial class ImageTests
             VerifyDecodedImage(img);
             Assert.IsType<BmpFormat>(img.Metadata.DecodedImageFormat);
         }
+
+        [Fact]
+        public void FromBytes_EmptySpan_Throws()
+            => Assert.ThrowsAny<UnknownImageFormatException>(() => Image.Load<Rgba32>([]));
     }
 }
diff --git a/tests/ImageSharp.Tests/Image/ImageTests.Load_FromStream_ThrowsRightException.cs b/tests/ImageSharp.Tests/Image/ImageTests.Load_FromStream_ThrowsRightException.cs
index a064b6472..c2609545d 100644
--- a/tests/ImageSharp.Tests/Image/ImageTests.Load_FromStream_ThrowsRightException.cs
+++ b/tests/ImageSharp.Tests/Image/ImageTests.Load_FromStream_ThrowsRightException.cs
@@ -32,6 +32,17 @@ public partial class ImageTests
                 }
             });
 
-        public void Dispose() => this.Stream?.Dispose();
+        [Fact]
+        public void FromStream_Empty_Throws()
+        {
+            using MemoryStream ms = new();
+            Assert.Throws<UnknownImageFormatException>(() => Image.Load(DecoderOptions.Default, ms));
+        }
+
+        public void Dispose()
+        {
+            this.Stream?.Dispose();
+            GC.SuppressFinalize(this);
+        }
     }
 }
diff --git a/tests/ImageSharp.Tests/ImageSharp.Tests.csproj b/tests/ImageSharp.Tests/ImageSharp.Tests.csproj
index ce391fad2..a1d5b0ee2 100644
--- a/tests/ImageSharp.Tests/ImageSharp.Tests.csproj
+++ b/tests/ImageSharp.Tests/ImageSharp.Tests.csproj
@@ -12,7 +12,7 @@
   <Choose>
     <When Condition="$(SIXLABORS_TESTING_PREVIEW) == true">
       <PropertyGroup>
-        <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+        <TargetFrameworks>net8.0;net10.0</TargetFrameworks>
       </PropertyGroup>
     </When>
     <Otherwise>
diff --git a/tests/ImageSharp.Tests/Metadata/Profiles/ICC/DataWriter/IccDataWriterPrimitivesTests.cs b/tests/ImageSharp.Tests/Metadata/Profiles/ICC/DataWriter/IccDataWriterPrimitivesTests.cs
index 0a9b888ed..c8f46d3aa 100644
--- a/tests/ImageSharp.Tests/Metadata/Profiles/ICC/DataWriter/IccDataWriterPrimitivesTests.cs
+++ b/tests/ImageSharp.Tests/Metadata/Profiles/ICC/DataWriter/IccDataWriterPrimitivesTests.cs
@@ -42,7 +42,7 @@ public class IccDataWriterPrimitivesTests
         byte[] output = writer.GetData();
 
         Assert.Equal(0, count);
-        Assert.Equal([], output);
+        Assert.Equal(Array.Empty<byte>(), output);
     }
 
     [Fact]
@@ -62,7 +62,7 @@ public class IccDataWriterPrimitivesTests
         byte[] output = writer.GetData();
 
         Assert.Equal(0, count);
-        Assert.Equal([], output);
+        Assert.Equal(Array.Empty<byte>(), output);
     }
 
     [Theory]
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Convolution/BokehBlurTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Convolution/BokehBlurTest.cs
index 70ad20ec9..93d4f5c42 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Convolution/BokehBlurTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Convolution/BokehBlurTest.cs
@@ -148,7 +148,7 @@ public class BokehBlurTest
 
     [Theory]
     [WithFileCollection(nameof(TestFiles), nameof(BokehBlurValues), PixelTypes.Rgba32, HwIntrinsics.AllowAll)]
-    [WithFileCollection(nameof(TestFiles), nameof(BokehBlurValues), PixelTypes.Rgba32, HwIntrinsics.DisableSSE41)]
+    [WithFileCollection(nameof(TestFiles), nameof(BokehBlurValues), PixelTypes.Rgba32, HwIntrinsics.DisableHWIntrinsic)]
     public void BokehBlurFilterProcessor_Bounded(TestImageProvider<Rgba32> provider, BokehBlurInfo value, HwIntrinsics intrinsicsFilter)
     {
         static void RunTest(string arg1, string arg2)
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/AffineTransformTests.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/AffineTransformTests.cs
index a7855e23a..941d78c43 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/AffineTransformTests.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/AffineTransformTests.cs
@@ -234,7 +234,23 @@ public class AffineTransformTests
         image.DebugSave(provider);
 
         Assert.Equal(4, image.Width);
-        Assert.Equal(8, image.Height);
+        Assert.Equal(7, image.Height);
+    }
+
+    [Theory]
+    [WithFile(TestImages.Png.Issue3000, PixelTypes.Rgba32, 3, 3)]
+    [WithFile(TestImages.Png.Issue3000, PixelTypes.Rgba32, 4, 4)]
+    public void Issue3000<TPixel>(TestImageProvider<TPixel> provider, float x, float y)
+        where TPixel : unmanaged, IPixel<TPixel>
+    {
+        using Image<TPixel> image = provider.GetImage();
+
+        image.Mutate(c => c
+        .Transform(new AffineTransformBuilder().AppendRotationDegrees(90, new Vector2(x, y))));
+
+        string details = $"p-{x}-{y}";
+        image.DebugSave(provider, testOutputDetails: details);
+        image.CompareToReferenceOutput(ValidatorComparer, provider, testOutputDetails: details);
     }
 
     [Theory]
@@ -267,31 +283,41 @@ public class AffineTransformTests
         image.CompareToReferenceOutput(ValidatorComparer, provider, testOutputDetails: radians);
     }
 
-    [Fact]
-    public void TransformRotationDoesNotOffset()
+    [Theory]
+    [WithSolidFilledImages(100, 100, "DimGray", PixelTypes.Rgba32)]
+    public void TransformRotationDoesNotOffset<TPixel>(TestImageProvider<TPixel> provider)
+        where TPixel : unmanaged, IPixel<TPixel>
     {
         Rgba32 background = Color.DimGray.ToPixel<Rgba32>();
-        Rgba32 marker = Color.Aqua.ToPixel<Rgba32>();
+        TPixel marker = Color.Aqua.ToPixel<TPixel>();
+
+        using Image<TPixel> canvas = provider.GetImage();
 
-        using Image<Rgba32> img = new(100, 100, background);
+        using Image<TPixel> img = canvas.Clone();
         img[0, 0] = marker;
 
         img.Mutate(c => c.Rotate(180));
 
         Assert.Equal(marker, img[99, 99]);
 
-        using Image<Rgba32> img2 = new(100, 100, background);
+        img.DebugSave(provider, "Rotate180");
+
+        using Image<TPixel> img2 = canvas.Clone();
         img2[0, 0] = marker;
 
         img2.Mutate(
             c =>
             c.Transform(new AffineTransformBuilder().AppendRotationDegrees(180), KnownResamplers.NearestNeighbor));
 
-        using Image<Rgba32> img3 = new(100, 100, background);
+        img.DebugSave(provider, "AffineRotate180NN");
+
+        using Image<TPixel> img3 = canvas.Clone();
         img3[0, 0] = marker;
 
         img3.Mutate(c => c.Transform(new AffineTransformBuilder().AppendRotationDegrees(180)));
 
+        img3.DebugSave(provider, "AffineRotate180Bicubic");
+
         ImageComparer.Exact.VerifySimilarity(img, img2);
         ImageComparer.Exact.VerifySimilarity(img, img3);
     }
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/ProjectiveTransformTests.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/ProjectiveTransformTests.cs
index ffbab87e2..2c2932667 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/ProjectiveTransformTests.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/ProjectiveTransformTests.cs
@@ -249,17 +249,17 @@ public class ProjectiveTransformTests
         image.Mutate(ctx => ctx.Transform(builder));
 
         // A 180-degree rotation inverts both axes around the image center.
-        // The subject location (5, 15) becomes (imageWidth - 5 - 1, imageHeight - 15 - 1) = (94, 84)
+        // The subject location (5, 15) becomes (imageWidth - 5, imageHeight - 15) = (95, 85)
         Assert.Equal(
-            [94, 84],
+            [95, 85],
             image.Metadata.ExifProfile.GetValue(ExifTag.SubjectLocation).Value);
 
         // The subject area is also mirrored around the center.
         // New X = imageWidth - originalX - width
         // New Y = imageHeight - originalY - height
-        // (5, 15, 50, 50) becomes (44, 34, 50, 50)
+        // (5, 15, 50, 50) becomes (45, 35, 50, 50)
         Assert.Equal(
-            [44, 34, 50, 50],
+            [45, 35, 50, 50],
             image.Metadata.ExifProfile.GetValue(ExifTag.SubjectArea).Value);
     }
 
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeTests.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeTests.cs
index 080bba2bf..87a8a1ebd 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeTests.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeTests.cs
@@ -652,7 +652,7 @@ public class ResizeTests
             image.Metadata.ExifProfile.GetValue(ExifTag.SubjectLocation).Value);
 
         Assert.Equal(
-            [2, 7, 11, 11],
+            [2, 7, 10, 10],
             image.Metadata.ExifProfile.GetValue(ExifTag.SubjectArea).Value);
     }
 }
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/RotateTests.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/RotateTests.cs
index f67f368a1..191f39cb2 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/RotateTests.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/RotateTests.cs
@@ -55,17 +55,17 @@ public class RotateTests
         image.Mutate(ctx => ctx.Rotate(180));
 
         // A 180-degree rotation inverts both axes around the image center.
-        // The subject location (5, 15) becomes (imageWidth - 5 - 1, imageHeight - 15 - 1) = (94, 84)
+        // The subject location (5, 15) becomes (imageWidth - 5, imageHeight - 15) = (95, 85)
         Assert.Equal(
-            [94, 84],
+            [95, 85],
             image.Metadata.ExifProfile.GetValue(ExifTag.SubjectLocation).Value);
 
         // The subject area is also mirrored around the center.
         // New X = imageWidth - originalX - width
         // New Y = imageHeight - originalY - height
-        // (5, 15, 50, 50) becomes (44, 34, 50, 50)
+        // (5, 15, 50, 50) becomes (45, 35, 50, 50)
         Assert.Equal(
-            [44, 34, 50, 50],
+            [45, 35, 50, 50],
             image.Metadata.ExifProfile.GetValue(ExifTag.SubjectArea).Value);
     }
 }
diff --git a/tests/ImageSharp.Tests/Processing/Transforms/ResizeTests.cs b/tests/ImageSharp.Tests/Processing/Transforms/ResizeTests.cs
index 1d445b980..3f2d8e059 100644
--- a/tests/ImageSharp.Tests/Processing/Transforms/ResizeTests.cs
+++ b/tests/ImageSharp.Tests/Processing/Transforms/ResizeTests.cs
@@ -102,6 +102,6 @@ public class ResizeTests : BaseImageOperationsExtensionTest
 
         FeatureTestRunner.RunWithHwIntrinsicsFeature(
             RunTest,
-            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableFMA);
+            HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX2);
     }
 }
diff --git a/tests/ImageSharp.Tests/Processing/Transforms/TransformBuilderTestBase.cs b/tests/ImageSharp.Tests/Processing/Transforms/TransformBuilderTestBase.cs
index 5caf071ac..73215b1c6 100644
--- a/tests/ImageSharp.Tests/Processing/Transforms/TransformBuilderTestBase.cs
+++ b/tests/ImageSharp.Tests/Processing/Transforms/TransformBuilderTestBase.cs
@@ -98,7 +98,7 @@ public abstract class TransformBuilderTestBase<TBuilder>
         this.AppendRotationDegrees(builder, degrees);
 
         // TODO: We should also test CreateRotationMatrixDegrees() (and all TransformUtils stuff!) for correctness
-        Matrix3x2 matrix = TransformUtils.CreateRotationTransformMatrixDegrees(degrees, size, TransformSpace.Pixel);
+        Matrix3x2 matrix = TransformUtilities.CreateRotationTransformMatrixDegrees(degrees, size);
 
         Vector2 position = new(x, y);
         Vector2 expected = Vector2.Transform(position, matrix);
@@ -152,7 +152,7 @@ public abstract class TransformBuilderTestBase<TBuilder>
 
         this.AppendSkewDegrees(builder, degreesX, degreesY);
 
-        Matrix3x2 matrix = TransformUtils.CreateSkewTransformMatrixDegrees(degreesX, degreesY, size, TransformSpace.Pixel);
+        Matrix3x2 matrix = TransformUtilities.CreateSkewTransformMatrixDegrees(degreesX, degreesY, size);
 
         Vector2 position = new(x, y);
         Vector2 expected = Vector2.Transform(position, matrix);
diff --git a/tests/ImageSharp.Tests/TestImages.cs b/tests/ImageSharp.Tests/TestImages.cs
index af6148c87..bc699da88 100644
--- a/tests/ImageSharp.Tests/TestImages.cs
+++ b/tests/ImageSharp.Tests/TestImages.cs
@@ -163,6 +163,9 @@ public static class TestImages
         // Issue 2924: https://github.com/SixLabors/ImageSharp/issues/2924
         public const string Issue2924 = "Png/issues/Issue_2924.png";
 
+        // Issue 3000: https://github.com/SixLabors/ImageSharp/issues/3000
+        public const string Issue3000 = "Png/issues/issue_3000.png";
+
         public static class Bad
         {
             public const string MissingDataChunk = "Png/xdtn0g01.png";
@@ -345,6 +348,7 @@ public static class TestImages
             public const string Issue2638 = "Jpg/issues/Issue2638.jpg";
             public const string Issue2758 = "Jpg/issues/issue-2758.jpg";
             public const string Issue2857 = "Jpg/issues/issue-2857-subsub-ifds.jpg";
+            public const string Issue2948 = "Jpg/issues/issue-2948-sos.jpg";
 
             public static class Fuzz
             {
diff --git a/tests/ImageSharp.Tests/TestUtilities/FeatureTesting/FeatureTestRunner.cs b/tests/ImageSharp.Tests/TestUtilities/FeatureTesting/FeatureTestRunner.cs
index 63126dcbc..d3671abd4 100644
--- a/tests/ImageSharp.Tests/TestUtilities/FeatureTesting/FeatureTestRunner.cs
+++ b/tests/ImageSharp.Tests/TestUtilities/FeatureTesting/FeatureTestRunner.cs
@@ -436,37 +436,38 @@ public enum HwIntrinsics : long
     // Use flags so we can pass multiple values without using params.
     // Don't base on 0 or use inverse for All as that doesn't translate to string values.
     DisableHWIntrinsic = 1L << 0,
-    DisableSSE = 1L << 1,
-    DisableSSE2 = 1L << 2,
-    DisableAES = 1L << 3,
-    DisablePCLMULQDQ = 1L << 4,
-    DisableSSE3 = 1L << 5,
-    DisableSSSE3 = 1L << 6,
-    DisableSSE41 = 1L << 7,
-    DisableSSE42 = 1L << 8,
-    DisablePOPCNT = 1L << 9,
-    DisableAVX = 1L << 10,
-    DisableFMA = 1L << 11,
-    DisableAVX2 = 1L << 12,
+    DisableSSE42 = 1L << 1,
+    DisableAVX = 1L << 2,
+    DisableAVX2 = 1L << 3,
+    DisableAVX512 = 1L << 4,
+    DisableAVX512v2 = 1L << 5,
+    DisableAVX512v3 = 1L << 6,
+    DisableAVX10v1 = 1L << 7,
+    DisableAVX10v2 = 1L << 8,
+    DisableAPX = 1L << 9,
+    DisableAES = 1L << 10,
+    DisableAVX512VP2INTERSECT = 1L << 11,
+    DisableAVXIFMA = 1L << 12,
     DisableAVXVNNI = 1L << 13,
-    DisableAVX512BW = 1L << 14,
-    DisableAVX512BW_VL = 1L << 15,
-    DisableAVX512CD = 1L << 16,
-    DisableAVX512CD_VL = 1L << 17,
-    DisableAVX512DQ = 1L << 18,
-    DisableAVX512DQ_VL = 1L << 19,
-    DisableAVX512F = 1L << 20,
-    DisableAVX512F_VL = 1L << 21,
-    DisableAVX512VBMI = 1L << 22,
-    DisableAVX512VBMI_VL = 1L << 23,
-    DisableBMI1 = 1L << 24,
-    DisableBMI2 = 1L << 25,
-    DisableLZCNT = 1L << 26,
-    DisableArm64AdvSimd = 1L << 27,
-    DisableArm64Crc32 = 1L << 28,
-    DisableArm64Dp = 1L << 29,
-    DisableArm64Aes = 1L << 30,
-    DisableArm64Sha1 = 1L << 31,
-    DisableArm64Sha256 = 1L << 32,
-    AllowAll = 1L << 33
+    DisableAVXVNNIINT = 1L << 14,
+    DisableGFNI = 1L << 15,
+    DisableSHA = 1L << 16,
+    DisableVAES = 1L << 17,
+    DisableWAITPKG = 1L << 18,
+    DisableX86Serialize = 1 << 19,
+    // Arm64
+    DisableArm64Aes = 1L << 20,
+    DisableArm64Atomics = 1L << 21,
+    DisableArm64Crc32 = 1L << 22,
+    DisableArm64Dczva = 1L << 23,
+    DisableArm64Dp = 1L << 24,
+    DisableArm64Rdm = 1L << 25,
+    DisableArm64Sha1 = 1L << 26,
+    DisableArm64Sha256 = 1L << 27,
+    DisableArm64Sve = 1L << 28,
+    DisableArm64Sve2 = 1L << 29,
+    // RISC-V64
+    DisableRiscV64Zba = 1L << 30,
+    DisableRiscV64Zbb = 1L << 31,
+    AllowAll = 1L << 32,
 }
diff --git a/tests/ImageSharp.Tests/TestUtilities/Tests/FeatureTestRunnerTests.cs b/tests/ImageSharp.Tests/TestUtilities/Tests/FeatureTestRunnerTests.cs
index 82b247d9d..ee3d02670 100644
--- a/tests/ImageSharp.Tests/TestUtilities/Tests/FeatureTestRunnerTests.cs
+++ b/tests/ImageSharp.Tests/TestUtilities/Tests/FeatureTestRunnerTests.cs
@@ -47,7 +47,7 @@ public class FeatureTestRunnerTests
         }
 
         FeatureTestRunner.RunWithHwIntrinsicsFeature(
-            () => Assert.True(Vector.IsHardwareAccelerated),
+            () => Assert.True(Vector.IsHardwareAccelerated, "Vector hardware acceleration should be enabled when AllowAll is specified."),
             HwIntrinsics.AllowAll);
     }
 
@@ -56,21 +56,21 @@ public class FeatureTestRunnerTests
     {
         static void AssertDisabled()
         {
-            Assert.False(Sse.IsSupported);
-            Assert.False(Sse2.IsSupported);
-            Assert.False(Aes.IsSupported);
-            Assert.False(Pclmulqdq.IsSupported);
-            Assert.False(Sse3.IsSupported);
-            Assert.False(Ssse3.IsSupported);
-            Assert.False(Sse41.IsSupported);
-            Assert.False(Sse42.IsSupported);
-            Assert.False(Popcnt.IsSupported);
-            Assert.False(Avx.IsSupported);
-            Assert.False(Fma.IsSupported);
-            Assert.False(Avx2.IsSupported);
-            Assert.False(Bmi1.IsSupported);
-            Assert.False(Bmi2.IsSupported);
-            Assert.False(Lzcnt.IsSupported);
+            Assert.False(Sse.IsSupported, "SSE should be disabled when DisableHWIntrinsic is set.");
+            Assert.False(Sse2.IsSupported, "SSE2 should be disabled when DisableHWIntrinsic is set.");
+            Assert.False(Aes.IsSupported, "AES (x86) should be disabled when DisableHWIntrinsic is set.");
+            Assert.False(Pclmulqdq.IsSupported, "PCLMULQDQ should be disabled when DisableHWIntrinsic is set.");
+            Assert.False(Sse3.IsSupported, "SSE3 should be disabled when DisableHWIntrinsic is set.");
+            Assert.False(Ssse3.IsSupported, "SSSE3 should be disabled when DisableHWIntrinsic is set.");
+            Assert.False(Sse41.IsSupported, "SSE4.1 should be disabled when DisableHWIntrinsic is set.");
+            Assert.False(Sse42.IsSupported, "SSE4.2 should be disabled when DisableHWIntrinsic is set.");
+            Assert.False(Popcnt.IsSupported, "POPCNT should be disabled when DisableHWIntrinsic is set.");
+            Assert.False(Avx.IsSupported, "AVX should be disabled when DisableHWIntrinsic is set.");
+            Assert.False(Fma.IsSupported, "FMA should be disabled when DisableHWIntrinsic is set.");
+            Assert.False(Avx2.IsSupported, "AVX2 should be disabled when DisableHWIntrinsic is set.");
+            Assert.False(Bmi1.IsSupported, "BMI1 should be disabled when DisableHWIntrinsic is set.");
+            Assert.False(Bmi2.IsSupported, "BMI2 should be disabled when DisableHWIntrinsic is set.");
+            Assert.False(Lzcnt.IsSupported, "LZCNT should be disabled when DisableHWIntrinsic is set.");
         }
 
         FeatureTestRunner.RunWithHwIntrinsicsFeature(
@@ -88,90 +88,70 @@ public class FeatureTestRunnerTests
             switch (Enum.Parse<HwIntrinsics>(intrinsic))
             {
                 case HwIntrinsics.DisableHWIntrinsic:
-                    Assert.False(Sse.IsSupported);
-                    Assert.False(Sse2.IsSupported);
-                    Assert.False(Aes.IsSupported);
-                    Assert.False(Pclmulqdq.IsSupported);
-                    Assert.False(Sse3.IsSupported);
-                    Assert.False(Ssse3.IsSupported);
-                    Assert.False(Sse41.IsSupported);
-                    Assert.False(Sse42.IsSupported);
-                    Assert.False(Popcnt.IsSupported);
-                    Assert.False(Avx.IsSupported);
-                    Assert.False(Fma.IsSupported);
-                    Assert.False(Avx2.IsSupported);
-                    Assert.False(Bmi1.IsSupported);
-                    Assert.False(Bmi2.IsSupported);
-                    Assert.False(Lzcnt.IsSupported);
-                    Assert.False(AdvSimd.IsSupported);
-                    Assert.False(System.Runtime.Intrinsics.Arm.Aes.IsSupported);
-                    Assert.False(Crc32.IsSupported);
-                    Assert.False(Dp.IsSupported);
-                    Assert.False(Sha1.IsSupported);
-                    Assert.False(Sha256.IsSupported);
-                    break;
-                case HwIntrinsics.DisableSSE:
-                    Assert.False(Sse.IsSupported);
-                    break;
-                case HwIntrinsics.DisableSSE2:
-                    Assert.False(Sse2.IsSupported);
+                    Assert.False(Sse.IsSupported, "SSE should be disabled when DisableHWIntrinsic is set.");
+                    Assert.False(Sse2.IsSupported, "SSE2 should be disabled when DisableHWIntrinsic is set.");
+                    Assert.False(Aes.IsSupported, "AES (x86) should be disabled when DisableHWIntrinsic is set.");
+                    Assert.False(Pclmulqdq.IsSupported, "PCLMULQDQ should be disabled when DisableHWIntrinsic is set.");
+                    Assert.False(Sse3.IsSupported, "SSE3 should be disabled when DisableHWIntrinsic is set.");
+                    Assert.False(Ssse3.IsSupported, "SSSE3 should be disabled when DisableHWIntrinsic is set.");
+                    Assert.False(Sse41.IsSupported, "SSE4.1 should be disabled when DisableHWIntrinsic is set.");
+                    Assert.False(Sse42.IsSupported, "SSE4.2 should be disabled when DisableHWIntrinsic is set.");
+                    Assert.False(Popcnt.IsSupported, "POPCNT should be disabled when DisableHWIntrinsic is set.");
+                    Assert.False(Avx.IsSupported, "AVX should be disabled when DisableHWIntrinsic is set.");
+                    Assert.False(Fma.IsSupported, "FMA should be disabled when DisableHWIntrinsic is set.");
+                    Assert.False(Avx2.IsSupported, "AVX2 should be disabled when DisableHWIntrinsic is set.");
+                    Assert.False(Bmi1.IsSupported, "BMI1 should be disabled when DisableHWIntrinsic is set.");
+                    Assert.False(Bmi2.IsSupported, "BMI2 should be disabled when DisableHWIntrinsic is set.");
+                    Assert.False(Lzcnt.IsSupported, "LZCNT should be disabled when DisableHWIntrinsic is set.");
+                    Assert.False(AdvSimd.IsSupported, "Arm64 AdvSimd should be disabled when DisableHWIntrinsic is set.");
+                    Assert.False(System.Runtime.Intrinsics.Arm.Aes.IsSupported, "Arm64 AES should be disabled when DisableHWIntrinsic is set.");
+                    Assert.False(Crc32.IsSupported, "Arm64 CRC32 should be disabled when DisableHWIntrinsic is set.");
+                    Assert.False(Dp.IsSupported, "Arm64 DotProd (DP) should be disabled when DisableHWIntrinsic is set.");
+                    Assert.False(Sha1.IsSupported, "Arm64 SHA1 should be disabled when DisableHWIntrinsic is set.");
+                    Assert.False(Sha256.IsSupported, "Arm64 SHA256 should be disabled when DisableHWIntrinsic is set.");
                     break;
                 case HwIntrinsics.DisableAES:
-                    Assert.False(Aes.IsSupported);
-                    break;
-                case HwIntrinsics.DisablePCLMULQDQ:
-                    Assert.False(Pclmulqdq.IsSupported);
-                    break;
-                case HwIntrinsics.DisableSSE3:
-                    Assert.False(Sse3.IsSupported);
-                    break;
-                case HwIntrinsics.DisableSSSE3:
-                    Assert.False(Ssse3.IsSupported);
-                    break;
-                case HwIntrinsics.DisableSSE41:
-                    Assert.False(Sse41.IsSupported);
+                    Assert.False(Aes.IsSupported, "AES (x86) should be disabled when DisableAES is set.");
+#if NET10_0_OR_GREATER
+                    Assert.False(Pclmulqdq.IsSupported, "PCLMULQDQ should be disabled when DisableAES is set (paired disable).");
+#endif
                     break;
                 case HwIntrinsics.DisableSSE42:
-                    Assert.False(Sse42.IsSupported);
-                    break;
-                case HwIntrinsics.DisablePOPCNT:
-                    Assert.False(Popcnt.IsSupported);
+#if NET10_0_OR_GREATER
+                    Assert.False(Sse3.IsSupported, "Sse3 should be disabled.");
+                    Assert.False(Ssse3.IsSupported, "Ssse3 should be disabled.");
+                    Assert.False(Sse41.IsSupported, "Sse41 should be disabled.");
+                    Assert.False(Popcnt.IsSupported, "Popcnt should be disabled.");
+#else
+                    Assert.False(Sse42.IsSupported, "Sse42 should be disabled when DisableSSE42 is set.");
+#endif
                     break;
                 case HwIntrinsics.DisableAVX:
-                    Assert.False(Avx.IsSupported);
-                    break;
-                case HwIntrinsics.DisableFMA:
-                    Assert.False(Fma.IsSupported);
+                    Assert.False(Avx.IsSupported, "AVX should be disabled when DisableAVX is set.");
                     break;
                 case HwIntrinsics.DisableAVX2:
-                    Assert.False(Avx2.IsSupported);
-                    break;
-                case HwIntrinsics.DisableBMI1:
-                    Assert.False(Bmi1.IsSupported);
-                    break;
-                case HwIntrinsics.DisableBMI2:
-                    Assert.False(Bmi2.IsSupported);
-                    break;
-                case HwIntrinsics.DisableLZCNT:
-                    Assert.False(Lzcnt.IsSupported);
-                    break;
-                case HwIntrinsics.DisableArm64AdvSimd:
-                    Assert.False(AdvSimd.IsSupported);
+                    Assert.False(Avx2.IsSupported, "AVX2 should be disabled when DisableAVX2 is set.");
+#if NET10_0_OR_GREATER
+                    Assert.False(Fma.IsSupported, "FMA should be disabled when DisableAVX2 is set (paired disable).");
+                    Assert.False(Bmi1.IsSupported, "BMI1 should be disabled when DisableAVX2 is set (paired disable).");
+                    Assert.False(Bmi2.IsSupported, "BMI2 should be disabled when DisableAVX2 is set (paired disable).");
+                    Assert.False(Lzcnt.IsSupported, "LZCNT should be disabled when DisableAVX2 is set (paired disable).");
+#endif
                     break;
                 case HwIntrinsics.DisableArm64Aes:
-                    Assert.False(System.Runtime.Intrinsics.Arm.Aes.IsSupported);
+                    Assert.False(System.Runtime.Intrinsics.Arm.Aes.IsSupported, "Arm64 AES should be disabled when DisableArm64Aes is set.");
                     break;
                 case HwIntrinsics.DisableArm64Crc32:
-                    Assert.False(Crc32.IsSupported);
+                    Assert.False(Crc32.IsSupported, "Arm64 CRC32 should be disabled when DisableArm64Crc32 is set.");
                     break;
                 case HwIntrinsics.DisableArm64Dp:
-                    Assert.False(Dp.IsSupported);
+                    Assert.False(Dp.IsSupported, "Arm64 DotProd (DP) should be disabled when DisableArm64Dp is set.");
                     break;
                 case HwIntrinsics.DisableArm64Sha1:
-                    Assert.False(Sha1.IsSupported);
+                    Assert.False(Sha1.IsSupported, "Arm64 SHA1 should be disabled when DisableArm64Sha1 is set.");
                     break;
                 case HwIntrinsics.DisableArm64Sha256:
-                    Assert.False(Sha256.IsSupported);
+                    Assert.False(Sha256.IsSupported, "Arm64 SHA256 should be disabled when DisableArm64Sha256 is set.");
                     break;
             }
         }
@@ -189,12 +169,12 @@ public class FeatureTestRunnerTests
         {
             Assert.NotNull(serializable);
             Assert.NotNull(FeatureTestRunner.DeserializeForXunit<FakeSerializable>(serializable));
-            Assert.False(Sse.IsSupported);
+            Assert.False(Sse42.IsSupported, "SSE42 should be disabled when DisableSSE42 is set (sanity check using serializable param overload).");
         }
 
         FeatureTestRunner.RunWithHwIntrinsicsFeature(
             AssertHwIntrinsicsFeatureDisabled,
-            HwIntrinsics.DisableSSE,
+            HwIntrinsics.DisableSSE42,
             new FakeSerializable());
     }
 
@@ -209,90 +189,69 @@ public class FeatureTestRunnerTests
             switch (Enum.Parse<HwIntrinsics>(intrinsic))
             {
                 case HwIntrinsics.DisableHWIntrinsic:
-                    Assert.False(Sse.IsSupported);
-                    Assert.False(Sse2.IsSupported);
-                    Assert.False(Aes.IsSupported);
-                    Assert.False(Pclmulqdq.IsSupported);
-                    Assert.False(Sse3.IsSupported);
-                    Assert.False(Ssse3.IsSupported);
-                    Assert.False(Sse41.IsSupported);
-                    Assert.False(Sse42.IsSupported);
-                    Assert.False(Popcnt.IsSupported);
-                    Assert.False(Avx.IsSupported);
-                    Assert.False(Fma.IsSupported);
-                    Assert.False(Avx2.IsSupported);
-                    Assert.False(Bmi1.IsSupported);
-                    Assert.False(Bmi2.IsSupported);
-                    Assert.False(Lzcnt.IsSupported);
-                    Assert.False(AdvSimd.IsSupported);
-                    Assert.False(System.Runtime.Intrinsics.Arm.Aes.IsSupported);
-                    Assert.False(Crc32.IsSupported);
-                    Assert.False(Dp.IsSupported);
-                    Assert.False(Sha1.IsSupported);
-                    Assert.False(Sha256.IsSupported);
-                    break;
-                case HwIntrinsics.DisableSSE:
-                    Assert.False(Sse.IsSupported);
-                    break;
-                case HwIntrinsics.DisableSSE2:
-                    Assert.False(Sse2.IsSupported);
+                    Assert.False(Sse.IsSupported, "SSE should be disabled when DisableHWIntrinsic is set.");
+                    Assert.False(Sse2.IsSupported, "SSE2 should be disabled when DisableHWIntrinsic is set.");
+                    Assert.False(Aes.IsSupported, "AES (x86) should be disabled when DisableHWIntrinsic is set.");
+                    Assert.False(Pclmulqdq.IsSupported, "PCLMULQDQ should be disabled when DisableHWIntrinsic is set.");
+                    Assert.False(Sse3.IsSupported, "SSE3 should be disabled when DisableHWIntrinsic is set.");
+                    Assert.False(Ssse3.IsSupported, "SSSE3 should be disabled when DisableHWIntrinsic is set.");
+                    Assert.False(Sse41.IsSupported, "SSE4.1 should be disabled when DisableHWIntrinsic is set.");
+                    Assert.False(Sse42.IsSupported, "SSE4.2 should be disabled when DisableHWIntrinsic is set.");
+                    Assert.False(Popcnt.IsSupported, "POPCNT should be disabled when DisableHWIntrinsic is set.");
+                    Assert.False(Avx.IsSupported, "AVX should be disabled when DisableHWIntrinsic is set.");
+                    Assert.False(Fma.IsSupported, "FMA should be disabled when DisableHWIntrinsic is set.");
+                    Assert.False(Avx2.IsSupported, "AVX2 should be disabled when DisableHWIntrinsic is set.");
+                    Assert.False(Bmi1.IsSupported, "BMI1 should be disabled when DisableHWIntrinsic is set.");
+                    Assert.False(Bmi2.IsSupported, "BMI2 should be disabled when DisableHWIntrinsic is set.");
+                    Assert.False(Lzcnt.IsSupported, "LZCNT should be disabled when DisableHWIntrinsic is set.");
+                    Assert.False(AdvSimd.IsSupported, "Arm64 AdvSimd should be disabled when DisableHWIntrinsic is set.");
+                    Assert.False(System.Runtime.Intrinsics.Arm.Aes.IsSupported, "Arm64 AES should be disabled when DisableHWIntrinsic is set.");
+                    Assert.False(Crc32.IsSupported, "Arm64 CRC32 should be disabled when DisableHWIntrinsic is set.");
+                    Assert.False(Dp.IsSupported, "Arm64 DotProd (DP) should be disabled when DisableHWIntrinsic is set.");
+                    Assert.False(Sha1.IsSupported, "Arm64 SHA1 should be disabled when DisableHWIntrinsic is set.");
+                    Assert.False(Sha256.IsSupported, "Arm64 SHA256 should be disabled when DisableHWIntrinsic is set.");
                     break;
                 case HwIntrinsics.DisableAES:
-                    Assert.False(Aes.IsSupported);
-                    break;
-                case HwIntrinsics.DisablePCLMULQDQ:
-                    Assert.False(Pclmulqdq.IsSupported);
-                    break;
-                case HwIntrinsics.DisableSSE3:
-                    Assert.False(Sse3.IsSupported);
-                    break;
-                case HwIntrinsics.DisableSSSE3:
-                    Assert.False(Ssse3.IsSupported);
-                    break;
-                case HwIntrinsics.DisableSSE41:
-                    Assert.False(Sse41.IsSupported);
+                    Assert.False(Aes.IsSupported, "AES (x86) should be disabled when DisableAES is set.");
+#if NET10_0_OR_GREATER
+                    Assert.False(Pclmulqdq.IsSupported, "PCLMULQDQ should be disabled when DisableAES is set (paired disable).");
+#endif
                     break;
                 case HwIntrinsics.DisableSSE42:
-                    Assert.False(Sse42.IsSupported);
-                    break;
-                case HwIntrinsics.DisablePOPCNT:
-                    Assert.False(Popcnt.IsSupported);
+#if NET10_0_OR_GREATER
+                    Assert.False(Sse3.IsSupported, "Sse3 should be disabled.");
+                    Assert.False(Ssse3.IsSupported, "Ssse3 should be disabled.");
+                    Assert.False(Sse41.IsSupported, "Sse41 should be disabled.");
+                    Assert.False(Popcnt.IsSupported, "Popcnt should be disabled.");
+#endif
+                    Assert.False(Sse42.IsSupported, "Sse42 should be disabled when DisableSSE42 is set.");
                     break;
                 case HwIntrinsics.DisableAVX:
-                    Assert.False(Avx.IsSupported);
-                    break;
-                case HwIntrinsics.DisableFMA:
-                    Assert.False(Fma.IsSupported);
+                    Assert.False(Avx.IsSupported, "AVX should be disabled when DisableAVX is set.");
                     break;
                 case HwIntrinsics.DisableAVX2:
-                    Assert.False(Avx2.IsSupported);
-                    break;
-                case HwIntrinsics.DisableBMI1:
-                    Assert.False(Bmi1.IsSupported);
-                    break;
-                case HwIntrinsics.DisableBMI2:
-                    Assert.False(Bmi2.IsSupported);
-                    break;
-                case HwIntrinsics.DisableLZCNT:
-                    Assert.False(Lzcnt.IsSupported);
-                    break;
-                case HwIntrinsics.DisableArm64AdvSimd:
-                    Assert.False(AdvSimd.IsSupported);
+                    Assert.False(Avx2.IsSupported, "AVX2 should be disabled when DisableAVX2 is set.");
+#if NET10_0_OR_GREATER
+                    Assert.False(Fma.IsSupported, "FMA should be disabled when DisableAVX2 is set (paired disable).");
+                    Assert.False(Bmi1.IsSupported, "BMI1 should be disabled when DisableAVX2 is set (paired disable).");
+                    Assert.False(Bmi2.IsSupported, "BMI2 should be disabled when DisableAVX2 is set (paired disable).");
+                    Assert.False(Lzcnt.IsSupported, "LZCNT should be disabled when DisableAVX2 is set (paired disable).");
+#endif
                     break;
                 case HwIntrinsics.DisableArm64Aes:
-                    Assert.False(System.Runtime.Intrinsics.Arm.Aes.IsSupported);
+                    Assert.False(System.Runtime.Intrinsics.Arm.Aes.IsSupported, "Arm64 AES should be disabled when DisableArm64Aes is set.");
                     break;
                 case HwIntrinsics.DisableArm64Crc32:
-                    Assert.False(Crc32.IsSupported);
+                    Assert.False(Crc32.IsSupported, "Arm64 CRC32 should be disabled when DisableArm64Crc32 is set.");
                     break;
                 case HwIntrinsics.DisableArm64Dp:
-                    Assert.False(Dp.IsSupported);
+                    Assert.False(Dp.IsSupported, "Arm64 DotProd (DP) should be disabled when DisableArm64Dp is set.");
                     break;
                 case HwIntrinsics.DisableArm64Sha1:
-                    Assert.False(Sha1.IsSupported);
+                    Assert.False(Sha1.IsSupported, "Arm64 SHA1 should be disabled when DisableArm64Sha1 is set.");
                     break;
                 case HwIntrinsics.DisableArm64Sha256:
-                    Assert.False(Sha256.IsSupported);
+                    Assert.False(Sha256.IsSupported, "Arm64 SHA256 should be disabled when DisableArm64Sha256 is set.");
                     break;
             }
         }
diff --git a/tests/Images/External/ReferenceOutput/AffineTransformTests/Issue3000_Rgba32_issue_3000_p-3-3.png b/tests/Images/External/ReferenceOutput/AffineTransformTests/Issue3000_Rgba32_issue_3000_p-3-3.png
new file mode 100644
index 000000000..385ac042c
--- /dev/null
+++ b/tests/Images/External/ReferenceOutput/AffineTransformTests/Issue3000_Rgba32_issue_3000_p-3-3.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d75205909d532dc98da52389c804ff99cb3b796b5657afb521659fe221c2b8f0
+size 122
diff --git a/tests/Images/External/ReferenceOutput/AffineTransformTests/Issue3000_Rgba32_issue_3000_p-4-4.png b/tests/Images/External/ReferenceOutput/AffineTransformTests/Issue3000_Rgba32_issue_3000_p-4-4.png
new file mode 100644
index 000000000..ef4aa03b9
--- /dev/null
+++ b/tests/Images/External/ReferenceOutput/AffineTransformTests/Issue3000_Rgba32_issue_3000_p-4-4.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a75beaec77378de4abb09317afa56b8e99ecba0d1c8571cad31aa790afb1a687
+size 123
diff --git a/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_FromSourceRectangle1_Rgba32_TestPattern96x48.png b/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_FromSourceRectangle1_Rgba32_TestPattern96x48.png
index 53ac0ff89..7fad1fcba 100644
--- a/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_FromSourceRectangle1_Rgba32_TestPattern96x48.png
+++ b/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_FromSourceRectangle1_Rgba32_TestPattern96x48.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bbe1ffaf7b801fd92724438cc810fd0c5506e0a907b970c4f0bf5bec3627ca2a
-size 551
+oid sha256:60b050406fda4ff347660e71cb28a9dfceb4b39532f62ee96cb61d2671d3cf00
+size 340
diff --git a/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_FromSourceRectangle1_Rgba32_TestPattern96x48__original.png b/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_FromSourceRectangle1_Rgba32_TestPattern96x48__original.png
new file mode 100644
index 000000000..0d610ae03
--- /dev/null
+++ b/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_FromSourceRectangle1_Rgba32_TestPattern96x48__original.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:74bf3b8655c7548f28c25b1e467992f691dc429f4b06e85cfd04a3b541825811
+size 478
diff --git a/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_FromSourceRectangle2_Rgba32_TestPattern96x48.png b/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_FromSourceRectangle2_Rgba32_TestPattern96x48.png
index 2480164d6..b22cbb019 100644
--- a/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_FromSourceRectangle2_Rgba32_TestPattern96x48.png
+++ b/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_FromSourceRectangle2_Rgba32_TestPattern96x48.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b45933471a1af1b6d4112240e1bc6b6187065a872043ddbf917200ce9e8cc84b
-size 371
+oid sha256:fbfb3143d96070c58c949e8d1e8d9ddbcf1e7863514489ea2defc65863c84e73
+size 276
diff --git a/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_RotateScaleTranslate_Rgba32_TestPattern100x50_R(0)_S(1,2)_T(0,0).png b/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_RotateScaleTranslate_Rgba32_TestPattern100x50_R(0)_S(1,2)_T(0,0).png
index da8e446c0..df64eea18 100644
--- a/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_RotateScaleTranslate_Rgba32_TestPattern100x50_R(0)_S(1,2)_T(0,0).png
+++ b/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_RotateScaleTranslate_Rgba32_TestPattern100x50_R(0)_S(1,2)_T(0,0).png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b66a5f9d8a7f3f2a78b868bec6c7d1deea927b82d81aa6d1677e0461a3920dc9
-size 3800
+oid sha256:120b661bef4adac64d362d8c987b3427cd8140ccac7404d09a16765ba1199434
+size 5191
diff --git a/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_RotateScaleTranslate_Rgba32_TestPattern100x50_R(0)_S(2,1)_T(0,0).png b/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_RotateScaleTranslate_Rgba32_TestPattern100x50_R(0)_S(2,1)_T(0,0).png
index 4c45ba8c6..b1e8764c1 100644
--- a/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_RotateScaleTranslate_Rgba32_TestPattern100x50_R(0)_S(2,1)_T(0,0).png
+++ b/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_RotateScaleTranslate_Rgba32_TestPattern100x50_R(0)_S(2,1)_T(0,0).png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d5fdc46ee866e088e0ec3221145a3d2d954a0bcb6d25cbb4d538978272f34949
-size 4871
+oid sha256:0d668ebe5f8857fd21d7eb9ae86860751a6f3061f6c9f76705ff49216dc07870
+size 6215
diff --git a/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_RotateScaleTranslate_Rgba32_TestPattern100x50_R(50)_S(1,1)_T(-20,-10).png b/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_RotateScaleTranslate_Rgba32_TestPattern100x50_R(50)_S(1,1)_T(-20,-10).png
index 480c07da4..6067f0ccc 100644
--- a/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_RotateScaleTranslate_Rgba32_TestPattern100x50_R(50)_S(1,1)_T(-20,-10).png
+++ b/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_RotateScaleTranslate_Rgba32_TestPattern100x50_R(50)_S(1,1)_T(-20,-10).png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5ae57ca0658b1ffa7aca9031f4ec065ab5a9813fb8a9c5acd221526df6a4f729
-size 9747
+oid sha256:2fb676b3af585e7cbe2efdb893157d5f4e152cf810d0693cafb81596e941e121
+size 9697
diff --git a/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_RotateScaleTranslate_Rgba32_TestPattern100x50_R(50)_S(1,1)_T(0,0).png b/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_RotateScaleTranslate_Rgba32_TestPattern100x50_R(50)_S(1,1)_T(0,0).png
index d1ea99cf9..69f862a5a 100644
--- a/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_RotateScaleTranslate_Rgba32_TestPattern100x50_R(50)_S(1,1)_T(0,0).png
+++ b/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_RotateScaleTranslate_Rgba32_TestPattern100x50_R(50)_S(1,1)_T(0,0).png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0fced9def2b41cbbf215a49ea6ef6baf4c3c041fd180671eb209db5c6e7177e5
-size 10470
+oid sha256:afe7ddbff155b918a4eff91af31e01100355c146cb9c8a12ab2496da8b22821d
+size 10446
diff --git a/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_RotateScaleTranslate_Rgba32_TestPattern100x50_R(50)_S(1,1)_T(20,10).png b/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_RotateScaleTranslate_Rgba32_TestPattern100x50_R(50)_S(1,1)_T(20,10).png
index 227f54651..5b88ba508 100644
--- a/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_RotateScaleTranslate_Rgba32_TestPattern100x50_R(50)_S(1,1)_T(20,10).png
+++ b/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_RotateScaleTranslate_Rgba32_TestPattern100x50_R(50)_S(1,1)_T(20,10).png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1e4cc16c2f1b439f8780dead04db01fed95f8e20b68270ae8e7a988af999e3db
-size 10561
+oid sha256:ad76301984e5b54eae374adfe130693667053fbed181847b4c68688fb74c9818
+size 10518
diff --git a/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_RotateScaleTranslate_Rgba32_TestPattern100x50_R(50)_S(1.1,1.3)_T(30,-20).png b/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_RotateScaleTranslate_Rgba32_TestPattern100x50_R(50)_S(1.1,1.3)_T(30,-20).png
index b93742a85..7f08d0dfd 100644
--- a/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_RotateScaleTranslate_Rgba32_TestPattern100x50_R(50)_S(1.1,1.3)_T(30,-20).png
+++ b/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_RotateScaleTranslate_Rgba32_TestPattern100x50_R(50)_S(1.1,1.3)_T(30,-20).png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:06e3966550f1c3ae72796e5522f7829cf1f86daca469c479acf49e6fae72e3d0
-size 13227
+oid sha256:fbd57af1fa982f9090f57d820a9b927f894914e5f54774e9cd6fdcfe14e5f761
+size 13139
diff --git a/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_RotateScaleTranslate_Rgba32_TestPattern100x50_R(50)_S(1.5,1.5)_T(0,0).png b/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_RotateScaleTranslate_Rgba32_TestPattern100x50_R(50)_S(1.5,1.5)_T(0,0).png
index 57c3b02ba..2d4ad649f 100644
--- a/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_RotateScaleTranslate_Rgba32_TestPattern100x50_R(50)_S(1.5,1.5)_T(0,0).png
+++ b/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_RotateScaleTranslate_Rgba32_TestPattern100x50_R(50)_S(1.5,1.5)_T(0,0).png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8ce5fefe04cc2a036fddcfcf038901a7a09b4ea5d0621a1e0d3abc8430953ae3
-size 20778
+oid sha256:c4bbc28c203550baf885cefba95c48a3f91dfb5242c09acbf3a8509b7258048e
+size 20768
diff --git a/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_RotateScale_ManuallyCentered_Rgba32_TestPattern96x96_R(50)_S(0.8).png b/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_RotateScale_ManuallyCentered_Rgba32_TestPattern96x96_R(50)_S(0.8).png
index b3bfc7ee5..08182dcfb 100644
--- a/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_RotateScale_ManuallyCentered_Rgba32_TestPattern96x96_R(50)_S(0.8).png
+++ b/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_RotateScale_ManuallyCentered_Rgba32_TestPattern96x96_R(50)_S(0.8).png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b653c0fe761d351cb15b09f35da578a954d103dea7507e2c1d7c4ebf3bdac49a
-size 10943
+oid sha256:566e85b1a527f48c953bcc7bc6c58ebd1fe0b14972c38edd596b025e0dd48624
+size 10940
diff --git a/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Bicubic.png b/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Bicubic.png
index a295c016d..392d3462f 100644
--- a/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Bicubic.png
+++ b/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Bicubic.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3a17bb1653cc6d6ecc292ce0670c651bfea032f61c6a0e84636205bde53a86f8
-size 13536
+oid sha256:aa5b0d5de93f26c0a7a03b57a00d4a49cda62f4a4b98b6d374261467c03a8357
+size 13500
diff --git a/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Box.png b/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Box.png
index 63214687d..56f2a3127 100644
--- a/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Box.png
+++ b/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Box.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b8970378312c0d479d618e4d5b8da54175c127db517fbe54f9057188d02cc735
-size 4165
+oid sha256:62267d8d56af3e1452f0e25144f2cfe352b88def98af28e819a3a6982040a4ca
+size 4102
diff --git a/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_CatmullRom.png b/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_CatmullRom.png
index a295c016d..5919cce39 100644
--- a/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_CatmullRom.png
+++ b/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_CatmullRom.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3a17bb1653cc6d6ecc292ce0670c651bfea032f61c6a0e84636205bde53a86f8
-size 13536
+oid sha256:878d5c53b84af4d133825206a327fd4cd02a43831ecabf5c61c5d89181c5a107
+size 13499
diff --git a/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Hermite.png b/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Hermite.png
index ef37b3e2d..fa01f13cc 100644
--- a/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Hermite.png
+++ b/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Hermite.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9bbf7ef00f98b410f309b3bf70ce87d3c6455666a26e89cd004744145a10408a
-size 12559
+oid sha256:f0aa3c19852632e603ec425aeecc5243d4c6c24a1ac6e3906d29913bf7ead2df
+size 12535
diff --git a/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Lanczos2.png b/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Lanczos2.png
index 93a0ce6c5..98ad27d78 100644
--- a/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Lanczos2.png
+++ b/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Lanczos2.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7f9ab86abad276d58bb029bd8e2c2aaffac5618322788cb3619577c7643e10d2
-size 14223
+oid sha256:ec648c2e8006d478ace4a78d2434a4ef7f10d4a3502468cd8b9e2b1f154620b6
+size 14278
diff --git a/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Lanczos3.png b/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Lanczos3.png
index c2ca6bf57..feb217ee9 100644
--- a/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Lanczos3.png
+++ b/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Lanczos3.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:05c4dc9af1fef422fd5ada2fa1459c26253e0fb5e5a13226fa2e7445ece32272
-size 17927
+oid sha256:6cb06152d5a0765ad86e8005d6ddac469914ccced89d5ee37d77e7d030b97c9e
+size 17281
diff --git a/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Lanczos5.png b/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Lanczos5.png
index ade9a1ccd..fd1cf7e77 100644
--- a/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Lanczos5.png
+++ b/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Lanczos5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:82b47e1cad2eea417b99a2e4b68a5ba1a6cd6703f360e8402f3dca8b92373ecc
-size 18945
+oid sha256:38ea8596a682be0075bb31ed176b1fe04b518eb887235d551a574e338d45880b
+size 18869
diff --git a/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Lanczos8.png b/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Lanczos8.png
index cf04e2036..619483421 100644
--- a/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Lanczos8.png
+++ b/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Lanczos8.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b15ce5a201ee6b946de485a58d3d8e779b6841457e096b2bd7a92968a122f9af
-size 20844
+oid sha256:965f42f021c63a0f2ccc691723c4ad7f92119294aec407c7ffd46a6238c8f268
+size 20792
diff --git a/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_MitchellNetravali.png b/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_MitchellNetravali.png
index 6be0fc0ff..7201a5f15 100644
--- a/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_MitchellNetravali.png
+++ b/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_MitchellNetravali.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a1622a48b3f4790d66b229ed29acd18504cedf68d0a548832665c28d47ea663b
-size 13857
+oid sha256:86f1b9e8f1e38070ce862d87c927313904ceaa9e6080f5acead90e82d164738c
+size 13879
diff --git a/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_NearestNeighbor.png b/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_NearestNeighbor.png
index 0064e973f..77c61443b 100644
--- a/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_NearestNeighbor.png
+++ b/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_NearestNeighbor.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:74df7b82e2148cfc8dae7e05c96009c0d70c09bf39cdc5ef9d727063d2a8cb3f
-size 4154
+oid sha256:270f9c2bf5d15fcb21796b3b9eb393e0cc00d9c337036637295ad1efb56781b1
+size 4114
diff --git a/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Robidoux.png b/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Robidoux.png
index 5dd0c5225..22dc949c3 100644
--- a/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Robidoux.png
+++ b/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Robidoux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cc740ccd76910e384ad84a780591652ac7ee0ea30abf7fd7f5b146f8ff380f07
-size 13991
+oid sha256:d413162a83c223124a2f29f8154e4bdc08d94bd3e15569ec6cffaa13bdda72c8
+size 13953
diff --git a/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_RobidouxSharp.png b/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_RobidouxSharp.png
index a6e120e90..3d86b73ab 100644
--- a/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_RobidouxSharp.png
+++ b/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_RobidouxSharp.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ccdc54e814604d4d339f6083091abf852aae65052ceb731af998208faddb5b0b
-size 13744
+oid sha256:941ea7b4d1f2c187f58920546e2f19fc275505929439cc389edcc59e652e8787
+size 13777
diff --git a/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Spline.png b/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Spline.png
index d32c11d44..060fdc809 100644
--- a/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Spline.png
+++ b/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Spline.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cd24e0a52c7743ab7d3ed255e3757c2d5495b3f56198556a157df589b1fb67ca
-size 14889
+oid sha256:cc5e6a607ef2343cb74c5227dbc7861840db956951f1fc4703fe53dbccda0974
+size 14808
diff --git a/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Triangle.png b/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Triangle.png
index 72782b0b9..524072160 100644
--- a/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Triangle.png
+++ b/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Triangle.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:878f1aab39b0b2405498c24146b8f81248b37b974e5ea7882e96174a034b645f
-size 12374
+oid sha256:2ac06a9ba2b2c8bef7e0117ac52fbb790101c0f89313dc49feb1f5a1d929ab02
+size 12381
diff --git a/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Welch.png b/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Welch.png
index 6cedab729..669aeba9a 100644
--- a/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Welch.png
+++ b/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Welch.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dcc2bf4f7e0ab3d56ee71ac1e1855dababeb2e4ec167fd5dc264efdc9e727328
-size 17027
+oid sha256:ad0f483fa7fda620860858c4f330ba914480fba15d70b408fb1aa3fed52dbfc1
+size 16839
diff --git a/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_With_Custom_Dimensions_Rgba32_TestPattern100x100_0.0001.png b/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_With_Custom_Dimensions_Rgba32_TestPattern100x100_0.0001.png
index 7368a3b00..438450e53 100644
--- a/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_With_Custom_Dimensions_Rgba32_TestPattern100x100_0.0001.png
+++ b/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_With_Custom_Dimensions_Rgba32_TestPattern100x100_0.0001.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6c733878f4c0cc6075a01fbe7cb471f8b3e91c2c5eaf89309ea3c073d9cc4921
-size 854
+oid sha256:ba501a7fc32a68f8989965aa6457b3860ec42947e2bcd4526c7570ff743f38fc
+size 841
diff --git a/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_With_Custom_Dimensions_Rgba32_TestPattern100x100_57.png b/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_With_Custom_Dimensions_Rgba32_TestPattern100x100_57.png
index da66b2676..f7f2101d7 100644
--- a/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_With_Custom_Dimensions_Rgba32_TestPattern100x100_57.png
+++ b/tests/Images/External/ReferenceOutput/AffineTransformTests/Transform_With_Custom_Dimensions_Rgba32_TestPattern100x100_57.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:af872886136893938aee82b1ac73e7a1820666a9a5f4bbf34159c09b3283169a
-size 5520
+oid sha256:8265c5b2e8edd5eaf0aeeccf86cac486e7beec581e696d3b4f4cfee8f4be9b2b
+size 5554
diff --git a/tests/Images/External/ReferenceOutput/Drawing/DrawImageTests/DrawTransformed.png b/tests/Images/External/ReferenceOutput/Drawing/DrawImageTests/DrawTransformed.png
index 7e693a583..3692f1a1e 100644
--- a/tests/Images/External/ReferenceOutput/Drawing/DrawImageTests/DrawTransformed.png
+++ b/tests/Images/External/ReferenceOutput/Drawing/DrawImageTests/DrawTransformed.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0ba180567e820b145a13c9b26db9c777e95126adfe8e8cacec0ffe1060dcfe8d
-size 184124
+oid sha256:7f8a4db4facce1d68b363a3b59ea40c9da9fa3c989c736d97a703c84d8230660
+size 184595
diff --git a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithQuadDistortion_Rgba32_TestPattern150x150_PointF [ X=-50, Y=-50 ]-PointF [ X=200, Y=-50 ]-PointF [ X=200, Y=200 ]-PointF [ X=-50, Y=200 ].png b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithQuadDistortion_Rgba32_TestPattern150x150_PointF [ X=-50, Y=-50 ]-PointF [ X=200, Y=-50 ]-PointF [ X=200, Y=200 ]-PointF [ X=-50, Y=200 ].png
index 38c603855..fc2f4b0c6 100644
--- a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithQuadDistortion_Rgba32_TestPattern150x150_PointF [ X=-50, Y=-50 ]-PointF [ X=200, Y=-50 ]-PointF [ X=200, Y=200 ]-PointF [ X=-50, Y=200 ].png	
+++ b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithQuadDistortion_Rgba32_TestPattern150x150_PointF [ X=-50, Y=-50 ]-PointF [ X=200, Y=-50 ]-PointF [ X=200, Y=200 ]-PointF [ X=-50, Y=200 ].png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:abce6af307a81a8ebac8e502142b00b2615403b5570c8dbe7b6895cfdd1a6d60
-size 66879
+oid sha256:ac986987f25d25ab964a5bef710fe81166cb643d85511906218b4f0e72e9e840
+size 30532
diff --git a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithQuadDistortion_Rgba32_TestPattern150x150_PointF [ X=0, Y=0 ]-PointF [ X=150, Y=0 ]-PointF [ X=150, Y=150 ]-PointF [ X=0, Y=150 ].png b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithQuadDistortion_Rgba32_TestPattern150x150_PointF [ X=0, Y=0 ]-PointF [ X=150, Y=0 ]-PointF [ X=150, Y=150 ]-PointF [ X=0, Y=150 ].png
index f7ea0d006..e0357c3f1 100644
--- a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithQuadDistortion_Rgba32_TestPattern150x150_PointF [ X=0, Y=0 ]-PointF [ X=150, Y=0 ]-PointF [ X=150, Y=150 ]-PointF [ X=0, Y=150 ].png	
+++ b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithQuadDistortion_Rgba32_TestPattern150x150_PointF [ X=0, Y=0 ]-PointF [ X=150, Y=0 ]-PointF [ X=150, Y=150 ]-PointF [ X=0, Y=150 ].png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d4cda265a50aa26711efafdbcd947c9a01eff872611df5298920583f9a3d4224
-size 26458
+oid sha256:e0ada2a4d32a3a757b803dbf08148f113f5d358b31af79a77e97c660ce96c302
+size 1608
diff --git a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithQuadDistortion_Rgba32_TestPattern150x150_PointF [ X=150, Y=0 ]-PointF [ X=150, Y=150 ]-PointF [ X=0, Y=150 ]-PointF [ X=0, Y=0 ].png b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithQuadDistortion_Rgba32_TestPattern150x150_PointF [ X=150, Y=0 ]-PointF [ X=150, Y=150 ]-PointF [ X=0, Y=150 ]-PointF [ X=0, Y=0 ].png
index 78c37cc44..18d91fe29 100644
--- a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithQuadDistortion_Rgba32_TestPattern150x150_PointF [ X=150, Y=0 ]-PointF [ X=150, Y=150 ]-PointF [ X=0, Y=150 ]-PointF [ X=0, Y=0 ].png	
+++ b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithQuadDistortion_Rgba32_TestPattern150x150_PointF [ X=150, Y=0 ]-PointF [ X=150, Y=150 ]-PointF [ X=0, Y=150 ]-PointF [ X=0, Y=0 ].png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:278a488a858b8eda141493fe00c617eb1f664196853da8341d7e5b7f231ddce4
-size 24645
+oid sha256:ffc30373989ec6857797b460931f011b30baaec633b095b6fc3d8fd5d43c77ec
+size 2467
diff --git a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithQuadDistortion_Rgba32_TestPattern150x150_PointF [ X=25, Y=50 ]-PointF [ X=210, Y=25 ]-PointF [ X=140, Y=210 ]-PointF [ X=15, Y=125 ].png b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithQuadDistortion_Rgba32_TestPattern150x150_PointF [ X=25, Y=50 ]-PointF [ X=210, Y=25 ]-PointF [ X=140, Y=210 ]-PointF [ X=15, Y=125 ].png
index b4740828d..c1b6694f5 100644
--- a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithQuadDistortion_Rgba32_TestPattern150x150_PointF [ X=25, Y=50 ]-PointF [ X=210, Y=25 ]-PointF [ X=140, Y=210 ]-PointF [ X=15, Y=125 ].png	
+++ b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithQuadDistortion_Rgba32_TestPattern150x150_PointF [ X=25, Y=50 ]-PointF [ X=210, Y=25 ]-PointF [ X=140, Y=210 ]-PointF [ X=15, Y=125 ].png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e03e79e6fab3a9e43041e54640a04c7cc3677709e7d879f9f410cf8afc7547a7
-size 42691
+oid sha256:9828ef0faf1a6709673cfe39028ed4202920d346bcc172bda6683bb3d1d0a7a3
+size 36577
diff --git a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Bicubic.png b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Bicubic.png
index 3826753d5..a515475c9 100644
--- a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Bicubic.png
+++ b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Bicubic.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:543dbf5376386bf518830850645d69934e2ca17ab208ce3fd5274a6a172f5206
-size 10951
+oid sha256:6bff913e6e67129325203fae91278ca17407b10d99c4e4f571e6cfe3b5b7f93c
+size 10889
diff --git a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Box.png b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Box.png
index f9aa1ffe0..779e437ff 100644
--- a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Box.png
+++ b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Box.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0d0cf291ebf5d8cebab1cd76e2830e5e2d2e0d9a050f7187da72680ead39110c
-size 2757
+oid sha256:54b761b76d03216e7aa6238eee92755c03f7b016bffd1400be66ecf136b29c26
+size 2747
diff --git a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_CatmullRom.png b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_CatmullRom.png
index 3826753d5..e165b5f3c 100644
--- a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_CatmullRom.png
+++ b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_CatmullRom.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:543dbf5376386bf518830850645d69934e2ca17ab208ce3fd5274a6a172f5206
-size 10951
+oid sha256:16da371a29269dade522b3d602beee8f769723c5712a348d960805b75619376d
+size 10889
diff --git a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Hermite.png b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Hermite.png
index 2f9109ba3..7d420da8c 100644
--- a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Hermite.png
+++ b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Hermite.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:57698b6666029a55edf8bd35a7ba96f68d224988cf01308a3af1c6606ae9d0b1
-size 10174
+oid sha256:b25b190603828131be8d82a27e019353c9bf80dcb38536e325abc5aa065762ed
+size 10230
diff --git a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Lanczos2.png b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Lanczos2.png
index 7dfec7898..96e71e12e 100644
--- a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Lanczos2.png
+++ b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Lanczos2.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fc7c9da04142a679887c714c43f1838eba0092a869140d234fce3412673207c6
-size 13575
+oid sha256:0cc07a20532c52151388c42d7add4f9749913c4dd7629253400a51d40760df23
+size 13566
diff --git a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Lanczos3.png b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Lanczos3.png
index 6e3b97f2d..5e04f3fe3 100644
--- a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Lanczos3.png
+++ b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Lanczos3.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d8b973f41f8afa39b94c71b307b7eb393953e2d083d56e1f0e8f43d6ab1f342a
-size 16821
+oid sha256:64aae32ec91233b6a139d2f515db4a3e609fa3ab6c660cb53b05d672e7f70e6f
+size 16795
diff --git a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Lanczos5.png b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Lanczos5.png
index 6986c0391..8206fbdbe 100644
--- a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Lanczos5.png
+++ b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Lanczos5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:122c1501e09516244f0db36e1cca373ff68514a18e84f57ed3072d52d6112e36
-size 17022
+oid sha256:c6167a1fb585b49167f4c8fa1f19111f10c825ea7d41ae4e266680d22b2bb28e
+size 17094
diff --git a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Lanczos8.png b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Lanczos8.png
index 76b53fabf..76aaf324a 100644
--- a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Lanczos8.png
+++ b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Lanczos8.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:12181516bce69c9302f15bba928fd530796449599cb9744a2411cc796788ee3b
-size 18066
+oid sha256:131e831cc2e2d8eb4f5860d0e685b31006ab846433e38440b6a85a445aed1a12
+size 17890
diff --git a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_MitchellNetravali.png b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_MitchellNetravali.png
index ae4242a42..10301fd32 100644
--- a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_MitchellNetravali.png
+++ b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_MitchellNetravali.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1eb5accc5ada5b963ecef6ac15bfb1845f481e51aef63e06a522ea73bbeab945
-size 11194
+oid sha256:aedcc9342e0b37d60759330f62db446646c31da172e21d931ee8e8451ee720ae
+size 11193
diff --git a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_NearestNeighbor.png b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_NearestNeighbor.png
index efb6a2dee..1f736d040 100644
--- a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_NearestNeighbor.png
+++ b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_NearestNeighbor.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0418f0ea38ec19b407f2b5046d7ff0ed207189ad71db1e50e82c419d83620543
-size 2759
+oid sha256:34f21056cac1ec3f1bd37a6c50466210e7ca7d8263963d2c503535b40e5b31d8
+size 2752
diff --git a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Robidoux.png b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Robidoux.png
index 976be43a3..b5269595c 100644
--- a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Robidoux.png
+++ b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Robidoux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1233a9ab2c4b0b17b0248c3d40050c466330c22095287dfbdb8bf7dfbda4ff1f
-size 11212
+oid sha256:b4e0cbe71672de45880111fb45c7b544203f67154060fa0707ba9216dfd6d883
+size 11217
diff --git a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_RobidouxSharp.png b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_RobidouxSharp.png
index 04fb2e87e..81a20c24a 100644
--- a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_RobidouxSharp.png
+++ b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_RobidouxSharp.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e2912d4e42c7b76d9ff48a49921d6472e351662597d69b88bc3708683c7933e3
-size 11221
+oid sha256:e8208cf34114bc87c6244f83a73e7c9dd4455da2fb6d25c34e32ed2fef3cfc9a
+size 11214
diff --git a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Spline.png b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Spline.png
index b35d68aaf..4edc410d9 100644
--- a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Spline.png
+++ b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Spline.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:51b05c38647e0c1d88cc722e4109a882305073a065d2a27ccd3bee82f727127d
-size 11775
+oid sha256:c4ee4328adcc71b1d9b3786ab2c03906aa725fefadd1d521206d5a04af421d8d
+size 11711
diff --git a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Triangle.png b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Triangle.png
index 64b9c6aba..f5877639e 100644
--- a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Triangle.png
+++ b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Triangle.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b260e816b23a43d7efb7507897ba2f5dbb6a596dd67a5abd4c9a0c005e926ee0
-size 9748
+oid sha256:fbc694ac18a702c127c588bb9184bcc39a01c1b8be5ceecadeaab4477260afec
+size 9984
diff --git a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Welch.png b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Welch.png
index 29b95bf52..49633ed22 100644
--- a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Welch.png
+++ b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithSampler_Rgba32_TestPattern150x150_Welch.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:50b03d627bb53048f5e56380500f116da4c503f5bb6a1b1d3c0d67ee4256d8f6
-size 15977
+oid sha256:8e85f331d7c4304fcd8ea8788da04982d9a5e43951be642bd7dbacd8907c3151
+size 15784
diff --git a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithTaperMatrix_Rgba32_Solid30x30_(255,0,0,255)_Bottom-Both.png b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithTaperMatrix_Rgba32_Solid30x30_(255,0,0,255)_Bottom-Both.png
index 54dca2639..65e75b83e 100644
--- a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithTaperMatrix_Rgba32_Solid30x30_(255,0,0,255)_Bottom-Both.png
+++ b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithTaperMatrix_Rgba32_Solid30x30_(255,0,0,255)_Bottom-Both.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:96454548849147d7c7f0ca507c8521a7d5eaa7771f9f383cc836858870b52c57
-size 280
+oid sha256:92153056f19a20cc1d6ff65dd36ffd215eb50509cc3544e338e76c8d5665fb27
+size 278
diff --git a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithTaperMatrix_Rgba32_Solid30x30_(255,0,0,255)_Bottom-LeftOrTop.png b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithTaperMatrix_Rgba32_Solid30x30_(255,0,0,255)_Bottom-LeftOrTop.png
index 41f94c9c7..7a9f2794c 100644
--- a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithTaperMatrix_Rgba32_Solid30x30_(255,0,0,255)_Bottom-LeftOrTop.png
+++ b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithTaperMatrix_Rgba32_Solid30x30_(255,0,0,255)_Bottom-LeftOrTop.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e94d224fdb284b6f1ba21b8caa66174edd7e6a3027f9dd03f4757e08296e6508
-size 212
+oid sha256:0db75a869ae36fbca7f57daa4495f2c16050b226474d203aba98cb8e0766d3fb
+size 249
diff --git a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithTaperMatrix_Rgba32_Solid30x30_(255,0,0,255)_Bottom-RightOrBottom.png b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithTaperMatrix_Rgba32_Solid30x30_(255,0,0,255)_Bottom-RightOrBottom.png
index 49cd1c837..4f01d8c13 100644
--- a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithTaperMatrix_Rgba32_Solid30x30_(255,0,0,255)_Bottom-RightOrBottom.png
+++ b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithTaperMatrix_Rgba32_Solid30x30_(255,0,0,255)_Bottom-RightOrBottom.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d1162be9fa1f31bee8d3cba05c1422a1945621a412be11cce13d376efd5c679c
-size 173
+oid sha256:09a80b11d888da121313d5f00ab0ec79ccf7bc49800135aa5eb411bd15fc6b86
+size 204
diff --git a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithTaperMatrix_Rgba32_Solid30x30_(255,0,0,255)_Left-Both.png b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithTaperMatrix_Rgba32_Solid30x30_(255,0,0,255)_Left-Both.png
index 59f928178..8985e6476 100644
--- a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithTaperMatrix_Rgba32_Solid30x30_(255,0,0,255)_Left-Both.png
+++ b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithTaperMatrix_Rgba32_Solid30x30_(255,0,0,255)_Left-Both.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0ed262e9b885af773a4a40a4506e678630670e208bf7f9ec10307e943b166bed
-size 258
+oid sha256:1ff446c4bb62d4492fc561a9dd48c4c0d95d8f4bcd9bbadf1675b2621baf9fa1
+size 212
diff --git a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithTaperMatrix_Rgba32_Solid30x30_(255,0,0,255)_Left-LeftOrTop.png b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithTaperMatrix_Rgba32_Solid30x30_(255,0,0,255)_Left-LeftOrTop.png
index 57ee3dc2f..1f9f0557b 100644
--- a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithTaperMatrix_Rgba32_Solid30x30_(255,0,0,255)_Left-LeftOrTop.png
+++ b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithTaperMatrix_Rgba32_Solid30x30_(255,0,0,255)_Left-LeftOrTop.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3a24f2cfc225d01294b8bbc5ca7d7f1738fb0b79217046eb9edf04e4c4c01851
-size 201
+oid sha256:2d76e8055ddbdaaa8f21117ab5e06d3e7d0f5da9d21dd2a992d82e284f028606
+size 235
diff --git a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithTaperMatrix_Rgba32_Solid30x30_(255,0,0,255)_Left-RightOrBottom.png b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithTaperMatrix_Rgba32_Solid30x30_(255,0,0,255)_Left-RightOrBottom.png
index 7e47f43ff..c8c5696b1 100644
--- a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithTaperMatrix_Rgba32_Solid30x30_(255,0,0,255)_Left-RightOrBottom.png
+++ b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithTaperMatrix_Rgba32_Solid30x30_(255,0,0,255)_Left-RightOrBottom.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:938186fb3d0f468176988a9530efd22e66241a1361fff027005ec8a8ae323ff3
-size 197
+oid sha256:c7e594fd12ea7863d297d66852d3f80d5d3645636cdd39611c7b6fae068a6dc9
+size 230
diff --git a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithTaperMatrix_Rgba32_Solid30x30_(255,0,0,255)_Right-Both.png b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithTaperMatrix_Rgba32_Solid30x30_(255,0,0,255)_Right-Both.png
index 0f756e781..434457ffc 100644
--- a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithTaperMatrix_Rgba32_Solid30x30_(255,0,0,255)_Right-Both.png
+++ b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithTaperMatrix_Rgba32_Solid30x30_(255,0,0,255)_Right-Both.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4bc4b8ea7e7f10676d8de612fe6bc5144e100b95ff3fe7a1e3d4066a7684ce4d
-size 239
+oid sha256:50f7f407d040b1071f7f6fbad96d6cfb2907d87060c671e74f6122ac5d381c30
+size 208
diff --git a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithTaperMatrix_Rgba32_Solid30x30_(255,0,0,255)_Right-LeftOrTop.png b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithTaperMatrix_Rgba32_Solid30x30_(255,0,0,255)_Right-LeftOrTop.png
index b2d420886..d3810b9d6 100644
--- a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithTaperMatrix_Rgba32_Solid30x30_(255,0,0,255)_Right-LeftOrTop.png
+++ b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithTaperMatrix_Rgba32_Solid30x30_(255,0,0,255)_Right-LeftOrTop.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:345337f7dffa48d95251503ee2ae8e91db98b5cbe06b579d73c38a018c781544
-size 182
+oid sha256:f305e35f0f4fac1c099b5d9f0b2775c1bb17f382aba13a068dedff45eda4632d
+size 215
diff --git a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithTaperMatrix_Rgba32_Solid30x30_(255,0,0,255)_Right-RightOrBottom.png b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithTaperMatrix_Rgba32_Solid30x30_(255,0,0,255)_Right-RightOrBottom.png
index 4f0ad9d04..74d204d7c 100644
--- a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithTaperMatrix_Rgba32_Solid30x30_(255,0,0,255)_Right-RightOrBottom.png
+++ b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithTaperMatrix_Rgba32_Solid30x30_(255,0,0,255)_Right-RightOrBottom.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:de4e2b71dade9dfb750a2c614a684963d6962958db79145c87fd23d9f0f8c005
-size 180
+oid sha256:c41784431d5a50746f66b3c34e966cb21fa8a088de797825633349cb077b4f97
+size 212
diff --git a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithTaperMatrix_Rgba32_Solid30x30_(255,0,0,255)_Top-Both.png b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithTaperMatrix_Rgba32_Solid30x30_(255,0,0,255)_Top-Both.png
index 78bdb8bbb..308fe3454 100644
--- a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithTaperMatrix_Rgba32_Solid30x30_(255,0,0,255)_Top-Both.png
+++ b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithTaperMatrix_Rgba32_Solid30x30_(255,0,0,255)_Top-Both.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8d8b651663366e7543211635f337c229e2f88f1142886ea3a9b69587daaada97
-size 288
+oid sha256:7a6b2c8e072993c00a96692f10c7ebe6fcc6f4cfdcb9dff2d0aa6c65db54e1c4
+size 267
diff --git a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithTaperMatrix_Rgba32_Solid30x30_(255,0,0,255)_Top-LeftOrTop.png b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithTaperMatrix_Rgba32_Solid30x30_(255,0,0,255)_Top-LeftOrTop.png
index 7015a0557..6111bcae1 100644
--- a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithTaperMatrix_Rgba32_Solid30x30_(255,0,0,255)_Top-LeftOrTop.png
+++ b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithTaperMatrix_Rgba32_Solid30x30_(255,0,0,255)_Top-LeftOrTop.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8ab8df31f1716c05bb8687f79c7d1154f6cc6f65e3917abe60ecc42d0df173dc
-size 215
+oid sha256:018fe6af5dd7ed2edd163bf3da5e22f8333d3e3287629a2065ebfd15b7a2a8b3
+size 256
diff --git a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithTaperMatrix_Rgba32_Solid30x30_(255,0,0,255)_Top-RightOrBottom.png b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithTaperMatrix_Rgba32_Solid30x30_(255,0,0,255)_Top-RightOrBottom.png
index 67a765e8d..a0935a1ce 100644
--- a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithTaperMatrix_Rgba32_Solid30x30_(255,0,0,255)_Top-RightOrBottom.png
+++ b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_WithTaperMatrix_Rgba32_Solid30x30_(255,0,0,255)_Top-RightOrBottom.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1a1671da9ea7702a37a866fabfb3ca0d746233ee108594198f23cb563af43ae6
-size 180
+oid sha256:530501bed8301799b68ba3dc8d50c877ed3f58073ab1a8a283e8f776e761cd28
+size 200
diff --git a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_With_Custom_Dimensions_Rgba32_TestPattern100x100_57.png b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_With_Custom_Dimensions_Rgba32_TestPattern100x100_57.png
index 4b2bb99d9..81863d3ef 100644
--- a/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_With_Custom_Dimensions_Rgba32_TestPattern100x100_57.png
+++ b/tests/Images/External/ReferenceOutput/ProjectiveTransformTests/Transform_With_Custom_Dimensions_Rgba32_TestPattern100x100_57.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1e7dedec16ccd66543a1d44052a104957ba62099ba2f2ccc72285c233c2ae3fa
-size 4411
+oid sha256:73a18d217d0db5e6ed55cbf52801b7f083e083ca2f0a6ac20d320fd29961e6e0
+size 4399
diff --git a/tests/Images/External/ReferenceOutput/Transforms/RotateTests/Rotate_WithAngle_TestPattern100x50_-170.png b/tests/Images/External/ReferenceOutput/Transforms/RotateTests/Rotate_WithAngle_TestPattern100x50_-170.png
index 65bb77977..c8b2ee0ce 100644
--- a/tests/Images/External/ReferenceOutput/Transforms/RotateTests/Rotate_WithAngle_TestPattern100x50_-170.png
+++ b/tests/Images/External/ReferenceOutput/Transforms/RotateTests/Rotate_WithAngle_TestPattern100x50_-170.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3594547265b23603b1a76ff6bc6f0eab4af55d6e0070e53356123dfc7ae256f8
-size 9034
+oid sha256:881daeef5b8db99af8b89e7d4e968fb4c43e13c904e936aefa1d0156b767803e
+size 9051
diff --git a/tests/Images/External/ReferenceOutput/Transforms/RotateTests/Rotate_WithAngle_TestPattern100x50_-50.png b/tests/Images/External/ReferenceOutput/Transforms/RotateTests/Rotate_WithAngle_TestPattern100x50_-50.png
index 7c54b1b07..ccd3d8fa5 100644
--- a/tests/Images/External/ReferenceOutput/Transforms/RotateTests/Rotate_WithAngle_TestPattern100x50_-50.png
+++ b/tests/Images/External/ReferenceOutput/Transforms/RotateTests/Rotate_WithAngle_TestPattern100x50_-50.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5ae9ef073f3338b71d2a40fcf2e89d9b6ab62204d6de9b6a1f75f4705ee197f0
-size 10704
+oid sha256:86032d5b7e49574655c1cd54886ac57d6385714481ba6bd72176d858f884cd1a
+size 10720
diff --git a/tests/Images/External/ReferenceOutput/Transforms/RotateTests/Rotate_WithAngle_TestPattern100x50_170.png b/tests/Images/External/ReferenceOutput/Transforms/RotateTests/Rotate_WithAngle_TestPattern100x50_170.png
index b6e930224..30a81a5b9 100644
--- a/tests/Images/External/ReferenceOutput/Transforms/RotateTests/Rotate_WithAngle_TestPattern100x50_170.png
+++ b/tests/Images/External/ReferenceOutput/Transforms/RotateTests/Rotate_WithAngle_TestPattern100x50_170.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:994dda7da034595aa77d107652bea06c86077d24ef8a6883b18f1f509bb19928
-size 8906
+oid sha256:cb823498eacf5bab12f7607d230523a3488e26fcc10fe1b3ab51de900a9dff97
+size 8835
diff --git a/tests/Images/External/ReferenceOutput/Transforms/RotateTests/Rotate_WithAngle_TestPattern100x50_50.png b/tests/Images/External/ReferenceOutput/Transforms/RotateTests/Rotate_WithAngle_TestPattern100x50_50.png
index d1ea99cf9..69f862a5a 100644
--- a/tests/Images/External/ReferenceOutput/Transforms/RotateTests/Rotate_WithAngle_TestPattern100x50_50.png
+++ b/tests/Images/External/ReferenceOutput/Transforms/RotateTests/Rotate_WithAngle_TestPattern100x50_50.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0fced9def2b41cbbf215a49ea6ef6baf4c3c041fd180671eb209db5c6e7177e5
-size 10470
+oid sha256:afe7ddbff155b918a4eff91af31e01100355c146cb9c8a12ab2496da8b22821d
+size 10446
diff --git a/tests/Images/External/ReferenceOutput/Transforms/RotateTests/Rotate_WithAngle_TestPattern50x100_-170.png b/tests/Images/External/ReferenceOutput/Transforms/RotateTests/Rotate_WithAngle_TestPattern50x100_-170.png
index 2f3f0f17f..b2f18f855 100644
--- a/tests/Images/External/ReferenceOutput/Transforms/RotateTests/Rotate_WithAngle_TestPattern50x100_-170.png
+++ b/tests/Images/External/ReferenceOutput/Transforms/RotateTests/Rotate_WithAngle_TestPattern50x100_-170.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:29c5f48f1ece0b12854b4c44fba84fdfc9ac5751cdf564a32478dcdaed43b2a4
-size 9798
+oid sha256:be885eca2d9771be335a29d3da533a17376efa4c563996ac4cb37138fd1899eb
+size 9826
diff --git a/tests/Images/External/ReferenceOutput/Transforms/RotateTests/Rotate_WithAngle_TestPattern50x100_-50.png b/tests/Images/External/ReferenceOutput/Transforms/RotateTests/Rotate_WithAngle_TestPattern50x100_-50.png
index 5242a9d98..39c4304be 100644
--- a/tests/Images/External/ReferenceOutput/Transforms/RotateTests/Rotate_WithAngle_TestPattern50x100_-50.png
+++ b/tests/Images/External/ReferenceOutput/Transforms/RotateTests/Rotate_WithAngle_TestPattern50x100_-50.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c7de58474c3f386c4ec31a9088d561a513f82c08d1157132d735169b847b9680
-size 11579
+oid sha256:afea3d7ec03c945d695b3cd85e9ea1d79cb35745256efe1e32273eb08789e5ce
+size 11476
diff --git a/tests/Images/External/ReferenceOutput/Transforms/RotateTests/Rotate_WithAngle_TestPattern50x100_170.png b/tests/Images/External/ReferenceOutput/Transforms/RotateTests/Rotate_WithAngle_TestPattern50x100_170.png
index 2af9d2fc2..e98d3115f 100644
--- a/tests/Images/External/ReferenceOutput/Transforms/RotateTests/Rotate_WithAngle_TestPattern50x100_170.png
+++ b/tests/Images/External/ReferenceOutput/Transforms/RotateTests/Rotate_WithAngle_TestPattern50x100_170.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3ef9b7051d7a5733dfe2534fddefdc28dfbc49d087355f46c4d945b04f0e3936
-size 9672
+oid sha256:096eba716663179933fe6eb526822ac9dedf83c3633d43df328ed33fb16900f6
+size 9687
diff --git a/tests/Images/External/ReferenceOutput/Transforms/RotateTests/Rotate_WithAngle_TestPattern50x100_50.png b/tests/Images/External/ReferenceOutput/Transforms/RotateTests/Rotate_WithAngle_TestPattern50x100_50.png
index 83c02764f..380b4b7d5 100644
--- a/tests/Images/External/ReferenceOutput/Transforms/RotateTests/Rotate_WithAngle_TestPattern50x100_50.png
+++ b/tests/Images/External/ReferenceOutput/Transforms/RotateTests/Rotate_WithAngle_TestPattern50x100_50.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:825770c9b2e9f265d834eab6b40604df5508bf9bc5b4f82f5d3effd6d5a26935
-size 11434
+oid sha256:c7367063704e10827bb81f46ebb56b6fe87a816eb8ec258ca95d8e26d9276f0f
+size 11408
diff --git a/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_IsNotBoundToSinglePixelType_Bgra32_TestPattern100x50_-20_-10.png b/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_IsNotBoundToSinglePixelType_Bgra32_TestPattern100x50_-20_-10.png
index d6dba3f88..e8822425d 100644
--- a/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_IsNotBoundToSinglePixelType_Bgra32_TestPattern100x50_-20_-10.png
+++ b/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_IsNotBoundToSinglePixelType_Bgra32_TestPattern100x50_-20_-10.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1e283463b0f450dd72cf303acccf3dd1ff7a31fe401ff0f288d67c4baefca240
-size 8742
+oid sha256:37acdbbcebe56ab98e17b025312e5860c471d807603c2ce6f4a50fd5f219c0f7
+size 8732
diff --git a/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_IsNotBoundToSinglePixelType_Bgra32_TestPattern100x50_20_10.png b/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_IsNotBoundToSinglePixelType_Bgra32_TestPattern100x50_20_10.png
index 76bb244d5..0a798ce06 100644
--- a/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_IsNotBoundToSinglePixelType_Bgra32_TestPattern100x50_20_10.png
+++ b/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_IsNotBoundToSinglePixelType_Bgra32_TestPattern100x50_20_10.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:485d9d9ef955a04af43d17e6bc3952e9bf65a9752b6cf8ba9cbbe8f772f05a18
-size 8995
+oid sha256:722d191e930331e296a548641a80ac163430bdb4017e3d68e4638fbb1d6ed45c
+size 9021
diff --git a/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_IsNotBoundToSinglePixelType_Rgb24_TestPattern100x50_-20_-10.png b/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_IsNotBoundToSinglePixelType_Rgb24_TestPattern100x50_-20_-10.png
index c1c1d814f..8d4d2fd9b 100644
--- a/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_IsNotBoundToSinglePixelType_Rgb24_TestPattern100x50_-20_-10.png
+++ b/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_IsNotBoundToSinglePixelType_Rgb24_TestPattern100x50_-20_-10.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d3d749ac365764051ea16bc39d1aff84c06faf282359805b58bb97c9eed7f0bb
-size 6400
+oid sha256:ce2bbe927b718a1b4de05b2baad7016b69490d1b5dfb085420192b7ac6c0ec5d
+size 6367
diff --git a/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_IsNotBoundToSinglePixelType_Rgb24_TestPattern100x50_20_10.png b/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_IsNotBoundToSinglePixelType_Rgb24_TestPattern100x50_20_10.png
index 27608881e..2d5fd9e9f 100644
--- a/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_IsNotBoundToSinglePixelType_Rgb24_TestPattern100x50_20_10.png
+++ b/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_IsNotBoundToSinglePixelType_Rgb24_TestPattern100x50_20_10.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8d82f2a15502b0a29aa4df1077ec90c88f9211f283fdc0edd7b059ed9b387441
-size 6334
+oid sha256:d79a7044e95a1ca032124366e4705bd93a866609547ebb489ff7d2228547cea5
+size 6330
diff --git a/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_WorksWithAllResamplers_ducky_Bicubic.png b/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_WorksWithAllResamplers_ducky_Bicubic.png
index 340455428..a9de3011d 100644
--- a/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_WorksWithAllResamplers_ducky_Bicubic.png
+++ b/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_WorksWithAllResamplers_ducky_Bicubic.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8e8afa56c5abb0e4b5895f35415db1178d041120d9f8306902f554cfaaada88d
-size 26540
+oid sha256:677e4419a1cac8692da2d852f6e169c4a66ef8f164fffa65550fccb71bb54563
+size 26606
diff --git a/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_WorksWithAllResamplers_ducky_Box.png b/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_WorksWithAllResamplers_ducky_Box.png
index 9ef786692..2ae230ac5 100644
--- a/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_WorksWithAllResamplers_ducky_Box.png
+++ b/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_WorksWithAllResamplers_ducky_Box.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a2c174ef54b68f025352e25800f655fe3b94a0d3f75cb48bd2ac0e8d6931faf8
-size 24827
+oid sha256:0f700e854d2d4ee9c12150ef300e0041fa4706ae595eeea6869894a1e2947eaf
+size 24963
diff --git a/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_WorksWithAllResamplers_ducky_CatmullRom.png b/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_WorksWithAllResamplers_ducky_CatmullRom.png
index 14f774853..63f5f9959 100644
--- a/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_WorksWithAllResamplers_ducky_CatmullRom.png
+++ b/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_WorksWithAllResamplers_ducky_CatmullRom.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6b56ceae2f350a1402beecc5b5e2930be1011a95fbf224cccf73b96f3931b646
-size 26531
+oid sha256:965248b773ea4b3f8e870ff598ccf88784dd700d9aa063b70b0146a00fc806bc
+size 26613
diff --git a/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_WorksWithAllResamplers_ducky_Hermite.png b/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_WorksWithAllResamplers_ducky_Hermite.png
index c8204eacf..bf1e06332 100644
--- a/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_WorksWithAllResamplers_ducky_Hermite.png
+++ b/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_WorksWithAllResamplers_ducky_Hermite.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:049ee7fc2bb758609a64149c338bfae2eab44755f53e6b7c25a5e8b8725ed8ac
-size 24416
+oid sha256:cd8e29141de12f1c1a2b3fb057a58b5a017b6db3498023a8f77dc8ac02d7845c
+size 24396
diff --git a/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_WorksWithAllResamplers_ducky_Lanczos2.png b/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_WorksWithAllResamplers_ducky_Lanczos2.png
index 2bc57092a..c903716e7 100644
--- a/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_WorksWithAllResamplers_ducky_Lanczos2.png
+++ b/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_WorksWithAllResamplers_ducky_Lanczos2.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:72c487a2fa3d608021b26a4d6b4517f8548fdcfc62fbafdd8649015dbec8ff87
-size 26504
+oid sha256:a28ac3e9bd2edc2aa7163275006f701672cd7f0b92454a0453a6e73387c70138
+size 26611
diff --git a/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_WorksWithAllResamplers_ducky_Lanczos3.png b/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_WorksWithAllResamplers_ducky_Lanczos3.png
index fee364e21..5749ec1ac 100644
--- a/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_WorksWithAllResamplers_ducky_Lanczos3.png
+++ b/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_WorksWithAllResamplers_ducky_Lanczos3.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:099733c9d4490c86cfbb10a016e2dd073539a95f9d5ff9018cf9b5be5404fa13
-size 33435
+oid sha256:2a57780c4145cf1eef6028d7e58ef94ab6d47f80a024f43fe98297f2d398a7fc
+size 33409
diff --git a/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_WorksWithAllResamplers_ducky_Lanczos5.png b/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_WorksWithAllResamplers_ducky_Lanczos5.png
index 30325ccc6..5f98b4184 100644
--- a/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_WorksWithAllResamplers_ducky_Lanczos5.png
+++ b/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_WorksWithAllResamplers_ducky_Lanczos5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:27f2a2b21f8ae878e15120ea5a4a983bde7984b3468dc8426055885efc278fe6
-size 35547
+oid sha256:129f1770502c71fcbe67da35a6966a4c72e4d17ee70a8e951a5229db99d03089
+size 35607
diff --git a/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_WorksWithAllResamplers_ducky_Lanczos8.png b/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_WorksWithAllResamplers_ducky_Lanczos8.png
index ff81256a7..979b0366a 100644
--- a/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_WorksWithAllResamplers_ducky_Lanczos8.png
+++ b/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_WorksWithAllResamplers_ducky_Lanczos8.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6b5cbe60e26e123e5a5cdf5a4e88305340f76d32a9c64a220c1fa7512f84e786
-size 39442
+oid sha256:0b7a58c5219ce2b6c91f98b7a75a9c89292e69d816451425b9b829d6a2b1711c
+size 39420
diff --git a/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_WorksWithAllResamplers_ducky_MitchellNetravali.png b/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_WorksWithAllResamplers_ducky_MitchellNetravali.png
index 263dd7426..6cfbcee61 100644
--- a/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_WorksWithAllResamplers_ducky_MitchellNetravali.png
+++ b/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_WorksWithAllResamplers_ducky_MitchellNetravali.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:102cceb79acb1dfd7ec8887b4906e33456c774d48320d1624b3c73975d26f145
-size 25981
+oid sha256:b80944705b204ab37b1a1a0b7d0705fba4f4eae4ea9453ae8ed0e39104765ee9
+size 25836
diff --git a/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_WorksWithAllResamplers_ducky_NearestNeighbor.png b/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_WorksWithAllResamplers_ducky_NearestNeighbor.png
index 9ef786692..2ae230ac5 100644
--- a/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_WorksWithAllResamplers_ducky_NearestNeighbor.png
+++ b/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_WorksWithAllResamplers_ducky_NearestNeighbor.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a2c174ef54b68f025352e25800f655fe3b94a0d3f75cb48bd2ac0e8d6931faf8
-size 24827
+oid sha256:0f700e854d2d4ee9c12150ef300e0041fa4706ae595eeea6869894a1e2947eaf
+size 24963
diff --git a/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_WorksWithAllResamplers_ducky_Robidoux.png b/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_WorksWithAllResamplers_ducky_Robidoux.png
index 85bbd5ec3..8aeed9c8d 100644
--- a/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_WorksWithAllResamplers_ducky_Robidoux.png
+++ b/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_WorksWithAllResamplers_ducky_Robidoux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e61629aeefac7e0a1a6b46b44ad86ed4a5ba0908bb3febc18bb5f9f3ded1c08d
-size 25751
+oid sha256:314e15b8d690b17aa67ee856bcaf55afc62ce86c1b1d86b0f17dffe8739a2d17
+size 25739
diff --git a/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_WorksWithAllResamplers_ducky_RobidouxSharp.png b/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_WorksWithAllResamplers_ducky_RobidouxSharp.png
index f200a5f95..e7e2c554b 100644
--- a/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_WorksWithAllResamplers_ducky_RobidouxSharp.png
+++ b/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_WorksWithAllResamplers_ducky_RobidouxSharp.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:45b1b48e1df393f4c435189c71a6bd3bccfe7a055d76d414a8d0c009b59fa0a0
-size 26145
+oid sha256:abf063ddd974a8eef6b24da9e58a10143d9fefa29369b11f7b27685312a0c74b
+size 26084
diff --git a/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_WorksWithAllResamplers_ducky_Spline.png b/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_WorksWithAllResamplers_ducky_Spline.png
index 434bb32a8..0d11b5565 100644
--- a/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_WorksWithAllResamplers_ducky_Spline.png
+++ b/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_WorksWithAllResamplers_ducky_Spline.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d6d186f9e547f658b719bc033e3b110d64cf2a02caecc510d4e2f88359e69746
-size 24176
+oid sha256:f417e1771b2a367f857888ae90bd75f9922d9e5fc8826009ded592d9da010a44
+size 24155
diff --git a/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_WorksWithAllResamplers_ducky_Triangle.png b/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_WorksWithAllResamplers_ducky_Triangle.png
index e3be1ffe5..0f305ddd3 100644
--- a/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_WorksWithAllResamplers_ducky_Triangle.png
+++ b/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_WorksWithAllResamplers_ducky_Triangle.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:339b3299984f1450f1a8200e487964c0338b511b82e459d67a3583d0bd46b805
-size 24013
+oid sha256:6aebe33dad1ea3a709f54f234cb779956f5b561a9a5ecf23a95e7ec42d91c535
+size 23905
diff --git a/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_WorksWithAllResamplers_ducky_Welch.png b/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_WorksWithAllResamplers_ducky_Welch.png
index 7dbeeaf35..835d72907 100644
--- a/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_WorksWithAllResamplers_ducky_Welch.png
+++ b/tests/Images/External/ReferenceOutput/Transforms/SkewTests/Skew_WorksWithAllResamplers_ducky_Welch.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5335c6184829fdc405475bd34d2fae60cf6d5ae050b4d671ac5dd25242ff1368
-size 31888
+oid sha256:bb7684478edd471057076a408c6b32102838db466476929ee58e248f5c20a2b2
+size 31872
diff --git a/tests/Images/Input/Jpg/issues/issue-2948-sos.jpg b/tests/Images/Input/Jpg/issues/issue-2948-sos.jpg
new file mode 100644
index 000000000..d210e87e5
--- /dev/null
+++ b/tests/Images/Input/Jpg/issues/issue-2948-sos.jpg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ad9c3a6babb41c5aa2a46fbfe74ed5482028c73f48531cf144e1e324ca7988b3
+size 103789
diff --git a/tests/Images/Input/Png/issues/issue_3000.png b/tests/Images/Input/Png/issues/issue_3000.png
new file mode 100644
index 000000000..d7d7ad4c6
--- /dev/null
+++ b/tests/Images/Input/Png/issues/issue_3000.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f33e2f343140b01d9c5c913f4ea695748e3a93df145bc0bf2f73763f2d24cadc
+size 385