Skip to content

Commit f492359

Browse files
Limit Magick.NET version for now
1 parent 4596511 commit f492359

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

tests/Directory.Build.targets

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,12 @@
1919
<ItemGroup>
2020
<!-- Test Dependencies -->
2121
<PackageReference Update="Colourful" Version="3.2.0" />
22-
<PackageReference Update="Magick.NET-Q16-AnyCPU" Version="14.2.0" />
22+
23+
<!--
24+
Do not update to 14+ yet. There's differnce in how the BMP decoder handles rounding in 16 bit images.
25+
See https://github.com/ImageMagick/ImageMagick/commit/27a0a9c37f18af9c8d823a3ea076f600843b553c
26+
-->
27+
<PackageReference Update="Magick.NET-Q16-AnyCPU" Version="13.10.0" />
2328
<PackageReference Update="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23580.1" />
2429
<PackageReference Update="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23580.1" />
2530
<PackageReference Update="Moq" Version="4.20.72" />

tests/ImageSharp.Benchmarks/LoadResizeSave/LoadResizeSaveStressRunner.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,10 +248,10 @@ public async Task ImageSharpResizeAsync(string input)
248248
public void MagickResize(string input)
249249
{
250250
using MagickImage image = new(input);
251-
this.LogImageProcessed((int)image.Width, (int)image.Height);
251+
this.LogImageProcessed(image.Width, image.Height);
252252

253253
// Resize it to fit a 150x150 square
254-
image.Resize((uint)this.ThumbnailSize, (uint)this.ThumbnailSize);
254+
image.Resize(this.ThumbnailSize, this.ThumbnailSize);
255255

256256
// Reduce the size of the file
257257
image.Strip();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ protected override Image<TPixel> Decode<TPixel>(DecoderOptions options, Stream s
5858

5959
MagickReadSettings settings = new()
6060
{
61-
FrameCount = options.MaxFrames
61+
FrameCount = (int)options.MaxFrames
6262
};
6363
settings.SetDefines(bmpReadDefines);
6464
settings.SetDefines(pngReadDefines);

0 commit comments

Comments
 (0)