DW-38: imagesharp v4 framework support

CI/job_templates/build_drawing_libraries.yml

@@ -36,6 +36,12 @@ jobs:
       inputs:
         packageType: 'sdk'
         version: '8.x'
+    # Six Labors license (required by the build-time check in ImageSharp 3.2.0 / 4.1.3 and ImageSharp.Drawing 3.x, i.e. the net6.0 and net8.0 targets)
+    - task: DownloadSecureFile@1
+      name: sixLaborsLicense
+      displayName: 'Download Six Labors license file'
+      inputs:
+        secureFile: 'sixlabors.lic'
     # Build
     - task: DotNetCoreCLI@2
       displayName: Restore Solution NuGet Packages
@@ -58,6 +64,7 @@ jobs:
           --no-restore
           --verbosity normal
           --property:AssemblyVersion=$(finalAssemblyVersion)
+          --property:SixLaborsLicenseFile=$(sixLaborsLicense.secureFilePath)
         versioningScheme: byEnvVar
         versionEnvVar: AssemblyVersion
     # Publish Pipeline Artifacts

CI/step_templates/sign_drawing_libraries_dll.yml

@@ -12,7 +12,7 @@ steps:
     custom: tool
     arguments: install --global AzureSignTool
 - task: PowerShell@2
-  displayName: 'Sign IronSoftware.Drawing.Common.dll .NET6'
+  displayName: 'Sign IronSoftware.Drawing.Common.dll netstandard2.0'
   inputs:
       workingDirectory: 'bin\$(Configuration)\netstandard2.0'
       targetType: 'inline'
@@ -29,10 +29,27 @@ steps:
           --verbose `
           "IronSoftware.Drawing.Common.dll"
 - task: PowerShell@2
-  displayName: 'Sign IronSoftware.Drawing.Common.dll .NET6'
+  displayName: 'Sign IronSoftware.Drawing.Common.dll .NET 6 (net60)'
   inputs:
       workingDirectory: 'bin\$(Configuration)\net60'
       targetType: 'inline'
+      script: |
+        azuresigntool sign `
+          --azure-key-vault-url "$(AZURE_KEY_VAULT_URL)" `
+          --azure-key-vault-client-id "$(AZURE_KEY_VAULT_APPLICATION_ID)" `
+          --azure-key-vault-client-secret "$(AZURE_KEY_VAULT_CLIENT_SECRET)" `
+          --azure-key-vault-tenant-id "$(AZURE_KEY_VAULT_TENANT_ID)" `
+          --azure-key-vault-certificate "$(AZURE_KEY_VAULT_CERTIFICATE_NAME)" `
+          --timestamp-rfc3161 "$(TimestampUrl)" `
+          --timestamp-digest sha256 `
+          --file-digest sha256 `
+          --verbose `
+          "IronSoftware.Drawing.Common.dll"
+- task: PowerShell@2
+  displayName: 'Sign IronSoftware.Drawing.Common.dll .NET 8 (net80)'
+  inputs:
+      workingDirectory: 'bin\$(Configuration)\net80'
+      targetType: 'inline'
       script: |
         azuresigntool sign `
           --azure-key-vault-url "$(AZURE_KEY_VAULT_URL)" `

IronSoftware.Drawing/IronSoftware.Drawing.Common.Tests/UnitTests/AnyBitmapFunctionality.cs

@@ -1,6 +1,7 @@
 using BitMiracle.LibTiff.Classic;
 using FluentAssertions;
 using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.Formats.Png;
 using SixLabors.ImageSharp.Metadata;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
@@ -1155,7 +1156,11 @@ public void Resize_ShouldPreserveDepthForRepresentableFormats()
             Assert.Equal(24, new AnyBitmap(rgb24, 20, 20).BitsPerPixel);
 
             string path64 = "dw40_tmp64.png";
+#if NET8_0_OR_GREATER
+            using (var img64 = new Image<Rgba64>(30, 30)) { img64.Save(path64, new SixLabors.ImageSharp.Formats.Png.PngEncoder { ColorType = SixLabors.ImageSharp.Formats.Png.PngColorType.RgbWithAlpha, BitDepth = SixLabors.ImageSharp.Formats.Png.PngBitDepth.Bit16 }); }
+#else
             using (var img64 = new Image<Rgba64>(30, 30)) { img64.SaveAsPng(path64); }
+#endif
             try
             {
                 var rgba64 = AnyBitmap.FromFile(path64);
@@ -1168,6 +1173,82 @@ public void Resize_ShouldPreserveDepthForRepresentableFormats()
             }
         }
 
+        [TheoryWithAutomaticDisplayName]
+        [InlineData("A8", "GrayscaleWithAlpha", "Bit8", 16)]
+        [InlineData("L8", "Grayscale", "Bit8", 8)]
+        [InlineData("L16", "Grayscale", "Bit16", 16)]
+        [InlineData("La16", "GrayscaleWithAlpha", "Bit8", 16)]
+        [InlineData("La32", "GrayscaleWithAlpha", "Bit16", 32)]
+        [InlineData("Rgb24", "Rgb", "Bit8", 24)]
+        [InlineData("Bgr24", "Rgb", "Bit8", 24)]
+        [InlineData("Rgb48", "Rgb", "Bit16", 48)]
+        [InlineData("Rgba32", "RgbWithAlpha", "Bit8", 32)]
+        [InlineData("Bgra32", "RgbWithAlpha", "Bit8", 32)]
+        [InlineData("Rgba64", "RgbWithAlpha", "Bit16", 64)]
+        [InlineData("RgbaVector", "RgbWithAlpha", "Bit16", 64)]
+        [InlineData("Bgr565", "RgbWithAlpha", "Bit8", 32)]
+        public void ExportPng_ShouldChooseColorTypeAndBitDepthFromPixelType(
+            string pixelType, string expectedColorType, string expectedBitDepth, int expectedBitsPerPixel)
+        {
+            using Image source = pixelType switch
+            {
+                "A8" => new Image<A8>(4, 4),
+                "L8" => new Image<L8>(4, 4),
+                "L16" => new Image<L16>(4, 4),
+                "La16" => new Image<La16>(4, 4),
+                "La32" => new Image<La32>(4, 4),
+                "Rgb24" => new Image<Rgb24>(4, 4),
+                "Bgr24" => new Image<Bgr24>(4, 4),
+                "Rgb48" => new Image<Rgb48>(4, 4),
+                "Rgba32" => new Image<Rgba32>(4, 4),
+                "Bgra32" => new Image<Bgra32>(4, 4),
+                "Rgba64" => new Image<Rgba64>(4, 4),
+                "RgbaVector" => new Image<RgbaVector>(4, 4),
+                "Bgr565" => new Image<SixLabors.ImageSharp.PixelFormats.Bgr565>(4, 4),
+                _ => throw new ArgumentOutOfRangeException(nameof(pixelType))
+            };
+            AnyBitmap bitmap = source;
+
+            byte[] png = bitmap.ExportBytes(AnyBitmap.ImageFormat.Png);
+
+            using (Image reloaded = Image.Load(png))
+            {
+                var pngMetadata = reloaded.Metadata.GetPngMetadata();
+                Assert.Equal(expectedColorType, pngMetadata.ColorType.ToString());
+                Assert.Equal(expectedBitDepth, pngMetadata.BitDepth.ToString());
+            }
+            Assert.Equal(expectedBitsPerPixel, AnyBitmap.FromBytes(png).BitsPerPixel);
+        }
+
+        [TheoryWithAutomaticDisplayName]
+        [InlineData("Palette", "Bit8")]
+        [InlineData("Grayscale", "Bit1")]
+        [InlineData("Grayscale", "Bit16")]
+        public void ExportPng_ShouldKeepSourcePngColorTypeAndBitDepthWhenReencoding(string colorType, string bitDepth)
+        {
+            byte[] sourcePng;
+            using (var source = new Image<Rgba32>(8, 8, new Rgba32(255, 255, 255, 255)))
+            using (var stream = new MemoryStream())
+            {
+                source.Save(stream, new SixLabors.ImageSharp.Formats.Png.PngEncoder
+                {
+                    ColorType = (SixLabors.ImageSharp.Formats.Png.PngColorType)Enum.Parse(typeof(SixLabors.ImageSharp.Formats.Png.PngColorType), colorType),
+                    BitDepth = (SixLabors.ImageSharp.Formats.Png.PngBitDepth)Enum.Parse(typeof(SixLabors.ImageSharp.Formats.Png.PngBitDepth), bitDepth)
+                });
+                sourcePng = stream.ToArray();
+            }
+
+            // RotateFlip decodes and re-encodes, so the output goes through the PNG encoder
+            // instead of returning the original bytes.
+            var rotated = AnyBitmap.FromBytes(sourcePng).RotateFlip(AnyBitmap.RotateMode.Rotate180, AnyBitmap.FlipMode.None);
+            byte[] png = rotated.ExportBytes(AnyBitmap.ImageFormat.Png);
+
+            using Image reloaded = Image.Load(png);
+            var pngMetadata = reloaded.Metadata.GetPngMetadata();
+            Assert.Equal(colorType, pngMetadata.ColorType.ToString());
+            Assert.Equal(bitDepth, pngMetadata.BitDepth.ToString());
+        }
+
         [FactWithAutomaticDisplayName]
         public void Resize_ShouldPreserveFrameCountForMultiPageTiff()
         {
@@ -1296,7 +1377,11 @@ public void Redact_ShouldRedactRegionWithColor()
             using var image = new Image<Rgba32>(Configuration.Default, 100, 100, Color.White);
             image.Save(memoryStream, new SixLabors.ImageSharp.Formats.Bmp.BmpEncoder()
             {
+#if NET8_0_OR_GREATER
+                BitsPerPixel = SixLabors.ImageSharp.Formats.Bmp.BmpBitsPerPixel.Bit32,
+#else
                 BitsPerPixel = SixLabors.ImageSharp.Formats.Bmp.BmpBitsPerPixel.Pixel32,
+#endif
                 SupportTransparency = true
             });
 

IronSoftware.Drawing/IronSoftware.Drawing.Common.Tests/UnitTests/ColorFunctionality.cs

@@ -284,14 +284,22 @@ public void Cast_ImageSharp_Color_from_Color()
             Assert.Equal(0, red.G);
             Assert.Equal(0, red.B);
 
+#if NET8_0_OR_GREATER
+            imgColor = SixLabors.ImageSharp.Color.FromPixel(new SixLabors.ImageSharp.PixelFormats.Rgba32(0, 255, 0, 255));
+#else
             imgColor = SixLabors.ImageSharp.Color.FromRgba(0, 255, 0, 255);
+#endif
             Color green = imgColor;
             Assert.Equal(255, green.A);
             Assert.Equal(0, green.R);
             Assert.Equal(255, green.G);
             Assert.Equal(0, green.B);
 
+#if NET8_0_OR_GREATER
+            imgColor = SixLabors.ImageSharp.Color.FromPixel(new SixLabors.ImageSharp.PixelFormats.Rgb24(0, 0, 255));
+#else
             imgColor = SixLabors.ImageSharp.Color.FromRgb(0, 0, 255);
+#endif
             Color blue = imgColor;
             Assert.Equal(255, blue.A);
             Assert.Equal(0, blue.R);
@@ -322,7 +330,11 @@ public void Cast_ImageSharp_Color_to_Color()
         [FactWithAutomaticDisplayName]
         public void Cast_ImageSharp_Rgba32_from_Color()
         {
+#if NET8_0_OR_GREATER
+            SixLabors.ImageSharp.PixelFormats.Rgba32 imgColor = SixLabors.ImageSharp.Color.Red.ToPixel<SixLabors.ImageSharp.PixelFormats.Rgba32>();
+#else
             SixLabors.ImageSharp.PixelFormats.Rgba32 imgColor = SixLabors.ImageSharp.Color.Red;
+#endif
             Color red = imgColor;
             Assert.Equal(255, red.A);
             Assert.Equal(255, red.R);
@@ -367,7 +379,11 @@ public void Cast_ImageSharp_Rgba32_to_Color()
         [FactWithAutomaticDisplayName]
         public void Cast_ImageSharp_Rgb24_from_Color()
         {
+#if NET8_0_OR_GREATER
+            SixLabors.ImageSharp.PixelFormats.Rgb24 imgColor = SixLabors.ImageSharp.Color.Red.ToPixel<SixLabors.ImageSharp.PixelFormats.Rgb24>();
+#else
             SixLabors.ImageSharp.PixelFormats.Rgb24 imgColor = SixLabors.ImageSharp.Color.Red;
+#endif
             Color red = imgColor;
             Assert.Equal(255, red.R);
             Assert.Equal(0, red.G);
@@ -470,7 +486,11 @@ public void Cast_ImageSharp_Rgb48_to_Color()
         [FactWithAutomaticDisplayName]
         public void Cast_ImageSharp_Rgba64_from_Color()
         {
+#if NET8_0_OR_GREATER
+            SixLabors.ImageSharp.PixelFormats.Rgba64 imgColor = SixLabors.ImageSharp.Color.Red.ToPixel<SixLabors.ImageSharp.PixelFormats.Rgba64>();
+#else
             SixLabors.ImageSharp.PixelFormats.Rgba64 imgColor = SixLabors.ImageSharp.Color.Red;
+#endif
             Color red = imgColor;
             Assert.Equal(255, red.R);
             Assert.Equal(0, red.G);