Merge branch 'main' into sn/promote-pixeltype

stefannikolei · web-flow · commit 1d223f7a6442 · 2023-12-04T06:26:30.000+01:00
diff --git a/.gitattributes b/.gitattributes
@@ -133,3 +133,6 @@
 *.pnm               filter=lfs diff=lfs merge=lfs -text
 *.wbmp              filter=lfs diff=lfs merge=lfs -text
 *.exr               filter=lfs diff=lfs merge=lfs -text
+*.ico               filter=lfs diff=lfs merge=lfs -text
+*.cur               filter=lfs diff=lfs merge=lfs -text
+*.ani               filter=lfs diff=lfs merge=lfs -text
diff --git a/shared-infrastructure b/shared-infrastructure
@@ -1 +1 @@
-Subproject commit 4e892950d7f17e5cb64160675d6902545cc3b5c5
+Subproject commit 1c526a97eea8bcbc7c79de095676f7fb975a9fb1
diff --git a/src/ImageSharp.ruleset b/src/ImageSharp.ruleset
@@ -1,9 +1,6 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <RuleSet Name="ImageSharp" ToolsVersion="17.0">
   <Include Path="..\shared-infrastructure\sixlabors.ruleset" Action="Default" />
-   <Rules AnalyzerId="Microsoft.CodeAnalysis.CSharp.NetAnalyzers" RuleNamespace="Microsoft.CodeAnalysis.CSharp.NetAnalyzers">
-    <Rule Id="CA1859" Action="None" />
-  </Rules>
   <Rules AnalyzerId="StyleCop.Analyzers" RuleNamespace="StyleCop.Analyzers">
     <Rule Id="SA1011" Action="None" />
   </Rules>
diff --git a/src/ImageSharp/Formats/Jpeg/Components/Decoder/JpegFrame.cs b/src/ImageSharp/Formats/Jpeg/Components/Decoder/JpegFrame.cs
@@ -133,7 +133,7 @@ public void Init(int maxSubFactorH, int maxSubFactorV)
 
         for (int i = 0; i < this.ComponentCount; i++)
         {
-            IJpegComponent component = this.Components[i];
+            JpegComponent component = this.Components[i];
             component.Init(maxSubFactorH, maxSubFactorV);
         }
     }
@@ -143,7 +143,7 @@ public void AllocateComponents()
         bool fullScan = this.Progressive || !this.Interleaved;
         for (int i = 0; i < this.ComponentCount; i++)
         {
-            IJpegComponent component = this.Components[i];
+            JpegComponent component = this.Components[i];
             component.AllocateSpectral(fullScan);
         }
     }
diff --git a/src/ImageSharp/Formats/Tiff/Ifd/DirectoryReader.cs b/src/ImageSharp/Formats/Tiff/Ifd/DirectoryReader.cs
@@ -71,7 +71,7 @@ private static ByteOrder ReadByteOrder(Stream stream)
         throw TiffThrowHelper.ThrowInvalidHeader();
     }
 
-    private IList<ExifProfile> ReadIfds(bool isBigTiff)
+    private List<ExifProfile> ReadIfds(bool isBigTiff)
     {
         List<EntryReader> readers = new();
         while (this.nextIfdOffset != 0 && this.nextIfdOffset < (ulong)this.stream.Length)
diff --git a/src/ImageSharp/ImageSharp.csproj b/src/ImageSharp/ImageSharp.csproj
@@ -22,8 +22,8 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <!--Bump to v3.1 prior to tagged release.-->
-    <MinVerMinimumMajorMinor>3.1</MinVerMinimumMajorMinor>
+    <!--Bump to v4.0 prior to tagged release.-->
+    <MinVerMinimumMajorMinor>4.0</MinVerMinimumMajorMinor>
   </PropertyGroup>
 
   <Choose>
diff --git a/src/ImageSharp/Metadata/Profiles/Exif/ExifReader.cs b/src/ImageSharp/Metadata/Profiles/Exif/ExifReader.cs
@@ -472,7 +472,7 @@ private void ReadValue64(List<IExifValue> values, Span<byte> offsetBuffer)
         }
     }
 
-    private void Add(IList<IExifValue> values, IExifValue exif, object? value)
+    private void Add(IList<IExifValue> values, ExifValue exif, object? value)
     {
         if (!exif.TrySetValue(value))
         {
diff --git a/tests/Directory.Build.targets b/tests/Directory.Build.targets
@@ -18,20 +18,18 @@
 
   <ItemGroup>
     <!-- Test Dependencies -->
-    <PackageReference Update="BenchmarkDotNet" Version="0.13.0" />
-    <PackageReference Update="BenchmarkDotNet.Diagnostics.Windows" Version="0.13.0" Condition="'$(IsWindows)'=='true'" />
-    <PackageReference Update="Colourful" Version="3.0.0" />
-    <PackageReference Update="Magick.NET-Q16-AnyCPU" Version="12.2.2" />
+    <PackageReference Update="Colourful" Version="3.1.0" />
+    <PackageReference Update="Magick.NET-Q16-AnyCPU" Version="13.4.0" />
     <PackageReference Update="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23580.1" />
     <PackageReference Update="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23580.1" />
-    <PackageReference Update="Moq" Version="4.14.6" />
-    <PackageReference Update="NetVips" Version="2.0.1" />
-    <PackageReference Update="NetVips.Native" Version="8.11.0" />
-    <PackageReference Update="PhotoSauce.MagicScaler" Version="0.12.1" />
-    <PackageReference Update="Pfim" Version="0.9.1" />
-    <PackageReference Update="runtime.osx.10.10-x64.CoreCompat.System.Drawing" Version="5.8.64" Condition="'$(IsOSX)'=='true'" />
+    <PackageReference Update="Moq" Version="4.20.70" />
+    <PackageReference Update="NetVips" Version="2.4.0" />
+    <PackageReference Update="NetVips.Native" Version="8.15.0" />
+    <PackageReference Update="PhotoSauce.MagicScaler" Version="0.14.0" />
+    <PackageReference Update="Pfim" Version="0.11.2" />
+    <PackageReference Update="runtime.osx.10.10-x64.CoreCompat.System.Drawing" Version="6.0.5.128" Condition="'$(IsOSX)'=='true'" />
     <PackageReference Update="SharpZipLib" Version="1.4.2" />
-    <PackageReference Update="SkiaSharp" Version="2.80.2" />
+    <PackageReference Update="SkiaSharp" Version="2.88.6" />
     <PackageReference Update="System.Drawing.Common" Version="6.0.0" />
     <PackageReference Update="System.IO.Compression" Version="4.3.0" />
   </ItemGroup>
diff --git a/tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.csproj b/tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.csproj
@@ -41,8 +41,8 @@
 
   <ItemGroup>
     <PackageReference Include="Magick.NET-Q16-AnyCPU" />
-    <PackageReference Include="BenchmarkDotNet" />
-    <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Condition="'$(OS)' == 'Windows_NT'" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.10" />
+    <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.13.10" Condition="'$(IsWindows)'=='true'" />
     <PackageReference Include="Colourful" />
     <PackageReference Include="NetVips" />
     <PackageReference Include="NetVips.Native" />
diff --git a/tests/ImageSharp.Benchmarks/LoadResizeSave/LoadResizeSaveStressRunner.cs b/tests/ImageSharp.Benchmarks/LoadResizeSave/LoadResizeSaveStressRunner.cs
@@ -269,9 +269,7 @@ public void MagicScalerResize(string input)
             Width = this.ThumbnailSize,
             Height = this.ThumbnailSize,
             ResizeMode = CropScaleMode.Max,
-            SaveFormat = FileFormat.Jpeg,
-            JpegQuality = Quality,
-            JpegSubsampleMode = ChromaSubsampleMode.Subsample420
+            EncoderOptions = new JpegEncoderOptions(Quality, ChromaSubsampleMode.Subsample420, true)
         };
 
         // TODO: Is there a way to capture input dimensions for IncreaseTotalMegapixels?
@@ -343,6 +341,6 @@ public void NetVipsResize(string input)
         using var thumb = NetVipsImage.Thumbnail(input, this.ThumbnailSize, this.ThumbnailSize);
 
         // Save the results
-        thumb.Jpegsave(this.OutputPath(input), q: Quality, strip: true);
+        thumb.Jpegsave(this.OutputPath(input), q: Quality, keep: NetVips.Enums.ForeignKeep.None);
     }
 }
diff --git a/tests/ImageSharp.Tests.ProfilingSandbox/ImageSharp.Tests.ProfilingSandbox.csproj b/tests/ImageSharp.Tests.ProfilingSandbox/ImageSharp.Tests.ProfilingSandbox.csproj
@@ -43,7 +43,7 @@
     <PackageReference Include="runtime.osx.10.10-x64.CoreCompat.System.Drawing" Condition="'$(IsOSX)'=='true'" />
     <PackageReference Include="SkiaSharp" />
     <PackageReference Include="System.Drawing.Common" />
-    <PackageReference Include="CommandLineParser" Version="2.8.0" />
+    <PackageReference Include="CommandLineParser" Version="2.9.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/tests/ImageSharp.Tests/ImageSharp.Tests.csproj b/tests/ImageSharp.Tests/ImageSharp.Tests.csproj
@@ -35,7 +35,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" />
+    <!--
+        Do not update or consolidate BenchmarkDotNet.
+        https://github.com/dotnet/arcade/issues/8483
+      -->
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.0"  />
     <PackageReference Include="Magick.NET-Q16-AnyCPU" />
     <PackageReference Include="Microsoft.DotNet.RemoteExecutor" />
     <PackageReference Include="Microsoft.DotNet.XUnitExtensions" />

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ public void Init(int maxSubFactorH, int maxSubFactorV)`
`133`	`133`
`134`	`134`	`for (int i = 0; i < this.ComponentCount; i++)`
`135`	`135`	`{`
`136`		`- IJpegComponent component = this.Components[i];`
	`136`	`+ JpegComponent component = this.Components[i];`
`137`	`137`	`component.Init(maxSubFactorH, maxSubFactorV);`
`138`	`138`	`}`
`139`	`139`	`}`
`@@ -143,7 +143,7 @@ public void AllocateComponents()`
`143`	`143`	`bool fullScan = this.Progressive \|\| !this.Interleaved;`
`144`	`144`	`for (int i = 0; i < this.ComponentCount; i++)`
`145`	`145`	`{`
`146`		`- IJpegComponent component = this.Components[i];`
	`146`	`+ JpegComponent component = this.Components[i];`
`147`	`147`	`component.AllocateSpectral(fullScan);`
`148`	`148`	`}`
`149`	`149`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ private static ByteOrder ReadByteOrder(Stream stream)`
`71`	`71`	`throw TiffThrowHelper.ThrowInvalidHeader();`
`72`	`72`	`}`
`73`	`73`
`74`		`- private IList<ExifProfile> ReadIfds(bool isBigTiff)`
	`74`	`+ private List<ExifProfile> ReadIfds(bool isBigTiff)`
`75`	`75`	`{`
`76`	`76`	`List<EntryReader> readers = new();`
`77`	`77`	`while (this.nextIfdOffset != 0 && this.nextIfdOffset < (ulong)this.stream.Length)`
Original file line number	Diff line number	Diff line change
`@@ -472,7 +472,7 @@ private void ReadValue64(List<IExifValue> values, Span<byte> offsetBuffer)`
`472`	`472`	`}`
`473`	`473`	`}`
`474`	`474`
`475`		`- private void Add(IList<IExifValue> values, IExifValue exif, object? value)`
	`475`	`+ private void Add(IList<IExifValue> values, ExifValue exif, object? value)`
`476`	`476`	`{`
`477`	`477`	`if (!exif.TrySetValue(value))`
`478`	`478`	`{`