Browse Source

Limit Magick.NET version for now

pull/2842/head
James Jackson-South 1 year ago
parent
commit
f4923598bb
  1. 7
      tests/Directory.Build.targets
  2. 4
      tests/ImageSharp.Benchmarks/LoadResizeSave/LoadResizeSaveStressRunner.cs
  3. 2
      tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/MagickReferenceDecoder.cs

7
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" />

4
tests/ImageSharp.Benchmarks/LoadResizeSave/LoadResizeSaveStressRunner.cs

@ -248,10 +248,10 @@ public class LoadResizeSaveStressRunner
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();

2
tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/MagickReferenceDecoder.cs

@ -58,7 +58,7 @@ public class MagickReferenceDecoder : ImageDecoder
MagickReadSettings settings = new()
{
FrameCount = options.MaxFrames
FrameCount = (int)options.MaxFrames
};
settings.SetDefines(bmpReadDefines);
settings.SetDefines(pngReadDefines);

Loading…
Cancel
Save