Limit Magick.NET version for now

SixLabors · Nov 21, 2024 · f492359 · f492359
1 parent 4596511
commit f492359
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/tests/Directory.Build.targets b/tests/Directory.Build.targets
@@ -19,7 +19,12 @@
   <ItemGroup>
     <!-- Test Dependencies -->
     <PackageReference Update="Colourful" Version="3.2.0" />
-    <PackageReference Update="Magick.NET-Q16-AnyCPU" Version="14.2.0" />
+
+    <!--
+    Do not update to 14+ yet. There's differnce in how the BMP decoder handles rounding in 16 bit images.
+    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.XUnitExtensions" Version="8.0.0-beta.23580.1" />
     <PackageReference Update="Moq" Version="4.20.72" />

diff --git a/tests/ImageSharp.Benchmarks/LoadResizeSave/LoadResizeSaveStressRunner.cs b/tests/ImageSharp.Benchmarks/LoadResizeSave/LoadResizeSaveStressRunner.cs
@@ -248,10 +248,10 @@ public async Task ImageSharpResizeAsync(string input)
     public void MagickResize(string input)
     {
         using MagickImage image = new(input);
-        this.LogImageProcessed((int)image.Width, (int)image.Height);
+        this.LogImageProcessed(image.Width, image.Height);
 
         // Resize it to fit a 150x150 square
-        image.Resize((uint)this.ThumbnailSize, (uint)this.ThumbnailSize);
+        image.Resize(this.ThumbnailSize, this.ThumbnailSize);
 
         // Reduce the size of the file
         image.Strip();

diff --git a/tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/MagickReferenceDecoder.cs b/tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/MagickReferenceDecoder.cs
@@ -58,7 +58,7 @@ protected override Image<TPixel> Decode<TPixel>(DecoderOptions options, Stream s
 
         MagickReadSettings settings = new()
         {
-            FrameCount = options.MaxFrames
+            FrameCount = (int)options.MaxFrames
         };
         settings.SetDefines(bmpReadDefines);
         settings.SetDefines(pngReadDefines);