Merge branch 'main' into js/gif-fixes

Author: JimBobSquarePants

.gitattributes

@@ -118,6 +118,7 @@
 *.bmp               filter=lfs diff=lfs merge=lfs -text
 *.gif               filter=lfs diff=lfs merge=lfs -text
 *.png               filter=lfs diff=lfs merge=lfs -text
+*.qoi               filter=lfs diff=lfs merge=lfs -text
 *.tif               filter=lfs diff=lfs merge=lfs -text
 *.tiff              filter=lfs diff=lfs merge=lfs -text
 *.tga               filter=lfs diff=lfs merge=lfs -text

ImageSharp.sln

@@ -646,6 +646,18 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tga", "Tga", "{5DFC394F-136
 		tests\Images\Input\Tga\targa_8bit_rle.tga = tests\Images\Input\Tga\targa_8bit_rle.tga
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Qoi", "Qoi", "{E801B508-4935-41CD-BA85-CF11BFF55A45}"
+	ProjectSection(SolutionItems) = preProject
+		tests\Images\Input\Qoi\dice.qoi = tests\Images\Input\Qoi\dice.qoi
+		tests\Images\Input\Qoi\edgecase.qoi = tests\Images\Input\Qoi\edgecase.qoi
+		tests\Images\Input\Qoi\kodim10.qoi = tests\Images\Input\Qoi\kodim10.qoi
+		tests\Images\Input\Qoi\kodim23.qoi = tests\Images\Input\Qoi\kodim23.qoi
+		tests\Images\Input\Qoi\qoi_logo.qoi = tests\Images\Input\Qoi\qoi_logo.qoi
+		tests\Images\Input\Qoi\testcard.qoi = tests\Images\Input\Qoi\testcard.qoi
+		tests\Images\Input\Qoi\testcard_rgba.qoi = tests\Images\Input\Qoi\testcard_rgba.qoi
+		tests\Images\Input\Qoi\wikipedia_008.qoi = tests\Images\Input\Qoi\wikipedia_008.qoi
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -698,6 +710,7 @@ Global
 		{FC527290-2F22-432C-B77B-6E815726B02C} = {56801022-D71A-4FBE-BC5B-CBA08E2284EC}
 		{670DD46C-82E9-499A-B2D2-00A802ED0141} = {E1C42A6F-913B-4A7B-B1A8-2BB62843B254}
 		{5DFC394F-136F-4B76-9BCA-3BA786515EFC} = {9DA226A1-8656-49A8-A58A-A8B5C081AD66}
+		{E801B508-4935-41CD-BA85-CF11BFF55A45} = {9DA226A1-8656-49A8-A58A-A8B5C081AD66}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {5F8B9D1F-CD8B-4CC5-8216-D531E25BD795}

shared-infrastructure

@@ -73,6 +73,30 @@ public static int LeastCommonMultiple(int a, int b)
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static nint Modulo8(nint x) => x & 7;
 
+    /// <summary>
+    /// Calculates <paramref name="x"/> % 64
+    /// </summary>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static int Modulo64(int x) => x & 63;
+
+    /// <summary>
+    /// Calculates <paramref name="x"/> % 64
+    /// </summary>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static nint Modulo64(nint x) => x & 63;
+
+    /// <summary>
+    /// Calculates <paramref name="x"/> % 256
+    /// </summary>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static int Modulo256(int x) => x & 255;
+
+    /// <summary>
+    /// Calculates <paramref name="x"/> % 256
+    /// </summary>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static nint Modulo256(nint x) => x & 255;
+
     /// <summary>
     /// Fast (x mod m) calculator, with the restriction that
     /// <paramref name="m"/> should be power of 2.

src/ImageSharp/Common/Helpers/Numerics.cs

@@ -8,6 +8,7 @@
 using SixLabors.ImageSharp.Formats.Jpeg;
 using SixLabors.ImageSharp.Formats.Pbm;
 using SixLabors.ImageSharp.Formats.Png;
+using SixLabors.ImageSharp.Formats.Qoi;
 using SixLabors.ImageSharp.Formats.Tga;
 using SixLabors.ImageSharp.Formats.Tiff;
 using SixLabors.ImageSharp.Formats.Webp;
@@ -212,6 +213,7 @@ public void Configure(IImageFormatConfigurationModule configuration)
     /// <see cref="TgaConfigurationModule"/>.
     /// <see cref="TiffConfigurationModule"/>.
     /// <see cref="WebpConfigurationModule"/>.
+    /// <see cref="QoiConfigurationModule"/>.
     /// </summary>
     /// <returns>The default configuration of <see cref="Configuration"/>.</returns>
     internal static Configuration CreateDefaultInstance() => new(
@@ -222,5 +224,6 @@ public void Configure(IImageFormatConfigurationModule configuration)
             new PbmConfigurationModule(),
             new TgaConfigurationModule(),
             new TiffConfigurationModule(),
-            new WebpConfigurationModule());
+            new WebpConfigurationModule(),
+            new QoiConfigurationModule());
 }

src/ImageSharp/Configuration.cs

@@ -14,9 +14,10 @@ using SixLabors.ImageSharp.Advanced;
         "Jpeg",
         "Pbm",
         "Png",
+        "Qoi",
         "Tga",
-        "Webp",
         "Tiff",
+        "Webp",
     };
 
     foreach (string fmt in formats)

src/ImageSharp/Formats/ImageExtensions.Save.cs

@@ -71,7 +71,9 @@ private JFifMarker(byte majorVersion, byte minorVersion, byte densityUnits, shor
     /// <param name="marker">The marker to return.</param>
     public static bool TryParse(ReadOnlySpan<byte> bytes, out JFifMarker marker)
     {
-        if (ProfileResolver.IsProfile(bytes, ProfileResolver.JFifMarker))
+        // Some images incorrectly use JFXX as the App0 marker (Issue 2478)
+        if (ProfileResolver.IsProfile(bytes, ProfileResolver.JFifMarker)
+            || ProfileResolver.IsProfile(bytes, ProfileResolver.JFxxMarker))
         {
             byte majorVersion = bytes[5];
             byte minorVersion = bytes[6];

src/ImageSharp/Formats/ImageExtensions.Save.tt

@@ -16,6 +16,14 @@ internal static class ProfileResolver
         (byte)'J', (byte)'F', (byte)'I', (byte)'F', (byte)'\0'
     };
 
+    /// <summary>
+    /// Gets the JFXX specific markers.
+    /// </summary>
+    public static ReadOnlySpan<byte> JFxxMarker => new[]
+    {
+        (byte)'J', (byte)'F', (byte)'X', (byte)'X', (byte)'\0'
+    };
+
     /// <summary>
     /// Gets the ICC specific markers.
     /// </summary>

src/ImageSharp/Formats/Jpeg/Components/Decoder/JFifMarker.cs

@@ -34,7 +34,7 @@ internal sealed class PngEncoderCore : IImageEncoderInternals, IDisposable
     private readonly MemoryAllocator memoryAllocator;
 
     /// <summary>
-    /// The configuration instance for the decoding operation.
+    /// The configuration instance for the encoding operation.
     /// </summary>
     private readonly Configuration configuration;