Use ICC profile when available for JPEG decoding color transforms.

Author: JimBobSquarePants

src/ImageSharp/Advanced/AotCompilerTools.cs

@@ -277,11 +277,11 @@ private static void AotCompileImageDecoders<TPixel>()
     private static void AotCompileSpectralConverter<TPixel>()
         where TPixel : unmanaged, IPixel<TPixel>
     {
-        default(SpectralConverter<TPixel>).GetPixelBuffer(default);
-        default(GrayJpegSpectralConverter<TPixel>).GetPixelBuffer(default);
-        default(RgbJpegSpectralConverter<TPixel>).GetPixelBuffer(default);
-        default(TiffJpegSpectralConverter<TPixel>).GetPixelBuffer(default);
-        default(TiffOldJpegSpectralConverter<TPixel>).GetPixelBuffer(default);
+        default(SpectralConverter<TPixel>).GetPixelBuffer(default, default);
+        default(GrayJpegSpectralConverter<TPixel>).GetPixelBuffer(default, default);
+        default(RgbJpegSpectralConverter<TPixel>).GetPixelBuffer(default, default);
+        default(TiffJpegSpectralConverter<TPixel>).GetPixelBuffer(default, default);
+        default(TiffOldJpegSpectralConverter<TPixel>).GetPixelBuffer(default, default);
     }
 
     /// <summary>

src/ImageSharp/ColorProfiles/Icc/SrgbV4Profile.Generated.cs renamed to src/ImageSharp/ColorProfiles/Icc/CompactSrgbV4Profile.cs

@@ -1,17 +1,17 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-// <auto-generated />
-
 using SixLabors.ImageSharp.Metadata.Profiles.Icc;
 
-namespace SixLabors.ImageSharp.ColorProfiles.Conversion.Icc;
+namespace SixLabors.ImageSharp.ColorProfiles.Icc;
 
-internal static class SrgbV4Profile
+internal static class CompactSrgbV4Profile
 {
+    private static readonly Lazy<IccProfile> LazyIccProfile = new(GetIccProfile);
+
     // Generated using the sRGB-v4.icc profile found at https://github.com/saucecontrol/Compact-ICC-Profiles
-    private static ReadOnlySpan<byte> Data => new byte[]
-    {
+    private static ReadOnlySpan<byte> Data =>
+    [
         0, 0, 1, 224, 108, 99, 109, 115, 4, 32, 0, 0, 109, 110, 116, 114, 82, 71, 66, 32, 88, 89, 90, 32, 7, 226, 0, 3, 0,
         20, 0, 9, 0, 14, 0, 29, 97, 99, 115, 112, 77, 83, 70, 84, 0, 0, 0, 0, 115, 97, 119, 115, 99, 116, 114, 108, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 246, 214, 0, 1, 0, 0, 0, 0, 211, 45, 104, 97, 110, 100, 163, 178, 171,
@@ -29,11 +29,9 @@ internal static class SrgbV4Profile
         3, 143, 88, 89, 90, 32, 0, 0, 0, 0, 0, 0, 98, 150, 0, 0, 183, 137, 0, 0, 24, 218, 88, 89, 90, 32, 0, 0, 0,
         0, 0, 0, 36, 160, 0, 0, 15, 133, 0, 0, 182, 196, 112, 97, 114, 97, 0, 0, 0, 0, 0, 3, 0, 0, 0, 2, 102, 105,
         0, 0, 242, 167, 0, 0, 13, 89, 0, 0, 19, 208, 0, 0, 10, 91,
-    };
+    ];
 
-    private static readonly Lazy<IccProfile> LazyIccProfile = new(() => GetIccProfile());
-
-    public static IccProfile GetProfile() => LazyIccProfile.Value;
+    public static IccProfile Profile => LazyIccProfile.Value;
 
     private static IccProfile GetIccProfile()
     {
@@ -42,4 +40,3 @@ private static IccProfile GetIccProfile()
         return new IccProfile(buffer);
     }
 }
-

src/ImageSharp/Formats/ColorProfileHandling.cs

@@ -13,9 +13,14 @@ public enum ColorProfileHandling
     /// </summary>
     Preserve,
 
+    /// <summary>
+    /// Removes any embedded Standard sRGB ICC color profiles without transforming the pixels of the image.
+    /// </summary>
+    Compact,
+
     /// <summary>
     /// Transforms the pixels of the image based on the conversion of any embedded ICC color profiles to sRGB V4 profile.
-    /// The original profile is then replaced.
+    /// The original profile is then removed.
     /// </summary>
     Convert
 }

src/ImageSharp/Formats/DecoderOptions.cs

@@ -1,6 +1,8 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
+using System.Diagnostics.CodeAnalysis;
+using SixLabors.ImageSharp.Metadata.Profiles.Icc;
 using SixLabors.ImageSharp.Processing;
 using SixLabors.ImageSharp.Processing.Processors.Transforms;
 
@@ -62,9 +64,46 @@ public sealed class DecoderOptions
 
     /// <summary>
     /// Gets a value that controls how ICC profiles are handled during decode.
-    /// TODO: Implement this.
     /// </summary>
-    internal ColorProfileHandling ColorProfileHandling { get; init; }
+    public ColorProfileHandling ColorProfileHandling { get; init; }
 
     internal void SetConfiguration(Configuration configuration) => this.configuration = configuration;
+
+    internal bool TryGetIccProfileForColorConversion(IccProfile? profile, [NotNullWhen(true)] out IccProfile? value)
+    {
+        value = null;
+
+        if (profile is null)
+        {
+            return false;
+        }
+
+        if (IccProfileHeader.IsLikelySrgb(profile.Header))
+        {
+            return false;
+        }
+
+        if (this.ColorProfileHandling == ColorProfileHandling.Preserve)
+        {
+            return false;
+        }
+
+        value = profile;
+        return true;
+    }
+
+    internal bool CanRemoveIccProfile(IccProfile? profile)
+    {
+        if (profile is null)
+        {
+            return false;
+        }
+
+        if (this.ColorProfileHandling == ColorProfileHandling.Compact && IccProfileHeader.IsLikelySrgb(profile.Header))
+        {
+            return true;
+        }
+
+        return this.ColorProfileHandling == ColorProfileHandling.Convert;
+    }
 }

src/ImageSharp/Formats/ImageDecoder.cs

@@ -24,6 +24,7 @@ public Image<TPixel> Decode<TPixel>(DecoderOptions options, Stream stream)
             s => this.Decode<TPixel>(options, s, default));
 
         this.SetDecoderFormat(options.Configuration, image);
+        HandleIccProfile(options, image);
 
         return image;
     }
@@ -37,6 +38,7 @@ public Image Decode(DecoderOptions options, Stream stream)
             s => this.Decode(options, s, default));
 
         this.SetDecoderFormat(options.Configuration, image);
+        HandleIccProfile(options, image);
 
         return image;
     }
@@ -52,6 +54,7 @@ public async Task<Image<TPixel>> DecodeAsync<TPixel>(DecoderOptions options, Str
             cancellationToken).ConfigureAwait(false);
 
         this.SetDecoderFormat(options.Configuration, image);
+        HandleIccProfile(options, image);
 
         return image;
     }
@@ -66,6 +69,7 @@ public async Task<Image> DecodeAsync(DecoderOptions options, Stream stream, Canc
             cancellationToken).ConfigureAwait(false);
 
         this.SetDecoderFormat(options.Configuration, image);
+        HandleIccProfile(options, image);
 
         return image;
     }
@@ -79,6 +83,7 @@ public ImageInfo Identify(DecoderOptions options, Stream stream)
             s => this.Identify(options, s, default));
 
         this.SetDecoderFormat(options.Configuration, info);
+        HandleIccProfile(options, info);
 
         return info;
     }
@@ -93,6 +98,7 @@ public async Task<ImageInfo> IdentifyAsync(DecoderOptions options, Stream stream
             cancellationToken).ConfigureAwait(false);
 
         this.SetDecoderFormat(options.Configuration, info);
+        HandleIccProfile(options, info);
 
         return info;
     }
@@ -315,4 +321,20 @@ internal void SetDecoderFormat(Configuration configuration, ImageInfo info)
             }
         }
     }
+
+    private static void HandleIccProfile(DecoderOptions options, Image image)
+    {
+        if (options.CanRemoveIccProfile(image.Metadata.IccProfile))
+        {
+            image.Metadata.IccProfile = null;
+        }
+    }
+
+    private static void HandleIccProfile(DecoderOptions options, ImageInfo image)
+    {
+        if (options.CanRemoveIccProfile(image.Metadata.IccProfile))
+        {
+            image.Metadata.IccProfile = null;
+        }
+    }
 }

src/ImageSharp/Formats/Jpeg/Components/ColorConverters/JpegColorConverter.CmykScalar.cs

@@ -1,6 +1,13 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
+using System.Buffers;
+using System.Numerics;
+using System.Runtime.InteropServices;
+using SixLabors.ImageSharp.ColorProfiles;
+using SixLabors.ImageSharp.ColorProfiles.Icc;
+using SixLabors.ImageSharp.Metadata.Profiles.Icc;
+
 namespace SixLabors.ImageSharp.Formats.Jpeg.Components;
 
 internal abstract partial class JpegColorConverterBase
@@ -16,6 +23,10 @@ public CmykScalar(int precision)
         public override void ConvertToRgbInPlace(in ComponentValues values) =>
             ConvertToRgbInPlace(values, this.MaximumValue);
 
+        /// <inheritdoc/>
+        public override void ConvertToRgbInPlaceWithIcc(Configuration configuration, in ComponentValues values, IccProfile profile)
+            => ConvertToRgbInPlaceWithIcc(configuration, profile, values, this.MaximumValue);
+
         /// <inheritdoc/>
         public override void ConvertFromRgb(in ComponentValues values, Span<float> rLane, Span<float> gLane, Span<float> bLane)
             => ConvertFromRgb(values, this.MaximumValue, rLane, gLane, bLane);
@@ -75,5 +86,31 @@ public static void ConvertFromRgb(in ComponentValues values, float maxValue, Spa
                 k[i] = maxValue - ktmp;
             }
         }
+
+        public static void ConvertToRgbInPlaceWithIcc(Configuration configuration, IccProfile profile, in ComponentValues values, float maxValue)
+        {
+            using IMemoryOwner<float> memoryOwner = configuration.MemoryAllocator.Allocate<float>(values.Component0.Length * 4);
+            Span<float> packed = memoryOwner.Memory.Span;
+
+            Span<float> c0 = values.Component0;
+            Span<float> c1 = values.Component1;
+            Span<float> c2 = values.Component2;
+            Span<float> c3 = values.Component3;
+
+            PackedInvertNormalizeInterleave4(c0, c1, c2, c3, packed, maxValue);
+
+            Span<Cmyk> source = MemoryMarshal.Cast<float, Cmyk>(packed);
+            Span<Rgb> destination = MemoryMarshal.Cast<float, Rgb>(packed)[..source.Length];
+
+            ColorConversionOptions options = new()
+            {
+                SourceIccProfile = profile,
+                TargetIccProfile = CompactSrgbV4Profile.Profile,
+            };
+            ColorProfileConverter converter = new(options);
+            converter.Convert<Cmyk, Rgb>(source, destination);
+
+            UnpackDeinterleave3(MemoryMarshal.Cast<float, Vector3>(packed)[..source.Length], c0, c1, c2);
+        }
     }
 }

src/ImageSharp/Formats/Jpeg/Components/ColorConverters/JpegColorConverter.CmykVector128.cs

@@ -1,9 +1,10 @@
-// Copyright (c) Six Labors.
+// Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Runtime.Intrinsics;
+using SixLabors.ImageSharp.Metadata.Profiles.Icc;
 
 namespace SixLabors.ImageSharp.Formats.Jpeg.Components;
 
@@ -46,6 +47,10 @@ public override void ConvertToRgbInPlace(in ComponentValues values)
             }
         }
 
+        /// <inheritdoc/>
+        public override void ConvertToRgbInPlaceWithIcc(Configuration configuration, in ComponentValues values, IccProfile profile)
+            => CmykScalar.ConvertToRgbInPlaceWithIcc(configuration, profile, values, this.MaximumValue);
+
         /// <inheritdoc/>
         public override void ConvertFromRgb(in ComponentValues values, Span<float> rLane, Span<float> gLane, Span<float> bLane)
             => ConvertFromRgb(in values, this.MaximumValue, rLane, gLane, bLane);

src/ImageSharp/Formats/Jpeg/Components/ColorConverters/JpegColorConverter.CmykVector256.cs

@@ -1,9 +1,10 @@
-// Copyright (c) Six Labors.
+// Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Runtime.Intrinsics;
+using SixLabors.ImageSharp.Metadata.Profiles.Icc;
 
 namespace SixLabors.ImageSharp.Formats.Jpeg.Components;
 
@@ -46,6 +47,10 @@ public override void ConvertToRgbInPlace(in ComponentValues values)
             }
         }
 
+        /// <inheritdoc/>
+        public override void ConvertToRgbInPlaceWithIcc(Configuration configuration, in ComponentValues values, IccProfile profile)
+            => CmykScalar.ConvertToRgbInPlaceWithIcc(configuration, profile, values, this.MaximumValue);
+
         /// <inheritdoc/>
         public override void ConvertFromRgb(in ComponentValues values, Span<float> rLane, Span<float> gLane, Span<float> bLane)
             => ConvertFromRgb(in values, this.MaximumValue, rLane, gLane, bLane);

src/ImageSharp/Formats/Jpeg/Components/ColorConverters/JpegColorConverter.CmykVector512.cs

@@ -1,9 +1,10 @@
-// Copyright (c) Six Labors.
+// Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Runtime.Intrinsics;
+using SixLabors.ImageSharp.Metadata.Profiles.Icc;
 
 namespace SixLabors.ImageSharp.Formats.Jpeg.Components;
 
@@ -16,6 +17,10 @@ public CmykVector512(int precision)
         {
         }
 
+        /// <inheritdoc/>
+        public override void ConvertToRgbInPlaceWithIcc(Configuration configuration, in ComponentValues values, IccProfile profile)
+            => CmykScalar.ConvertToRgbInPlaceWithIcc(configuration, profile, values, this.MaximumValue);
+
         /// <inheritdoc/>
         protected override void ConvertToRgbInPlaceVectorized(in ComponentValues values)
         {