Skip to content

Commit e44e03c

Browse files
committed
Update to Magick.NET 14.10.0
1 parent 4d58d91 commit e44e03c

File tree

5 files changed

+14
-14
lines changed

5 files changed

+14
-14
lines changed

tests/Directory.Build.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
Do not update to 14+ yet. There's differnce in how the BMP decoder handles rounding in 16 bit images.
2525
See https://github.com/ImageMagick/ImageMagick/commit/27a0a9c37f18af9c8d823a3ea076f600843b553c
2626
-->
27-
<PackageReference Update="Magick.NET-Q16-AnyCPU" Version="13.10.0" />
27+
<PackageReference Update="Magick.NET-Q16-AnyCPU" Version="14.10.0" />
2828
<PackageReference Update="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25563.105" />
2929
<PackageReference Update="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23580.1" />
3030
<PackageReference Update="Moq" Version="4.20.72" />

tests/ImageSharp.Benchmarks/Codecs/Tga/DecodeTga.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public void SetupData()
2727
=> this.data = File.ReadAllBytes(this.TestImageFullPath);
2828

2929
[Benchmark(Baseline = true, Description = "ImageMagick Tga")]
30-
public int TgaImageMagick()
30+
public uint TgaImageMagick()
3131
{
3232
MagickReadSettings settings = new() { Format = MagickFormat.Tga };
3333
using MagickImage image = new(new MemoryStream(this.data), settings);

tests/ImageSharp.Benchmarks/Codecs/Webp/DecodeWebp.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public void ReadImages()
4242
}
4343

4444
[Benchmark(Description = "Magick Lossy Webp")]
45-
public int WebpLossyMagick()
45+
public uint WebpLossyMagick()
4646
{
4747
MagickReadSettings settings = new() { Format = MagickFormat.WebP };
4848
using MemoryStream memoryStream = new(this.webpLossyBytes);
@@ -59,7 +59,7 @@ public int WebpLossy()
5959
}
6060

6161
[Benchmark(Description = "Magick Lossless Webp")]
62-
public int WebpLosslessMagick()
62+
public uint WebpLosslessMagick()
6363
{
6464
MagickReadSettings settings = new()
6565
{ Format = MagickFormat.WebP };

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(image.Width, image.Height);
251+
this.LogImageProcessed((int)image.Width, (int)image.Height);
252252

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

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

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,26 +58,26 @@ protected override Image<TPixel> Decode<TPixel>(DecoderOptions options, Stream s
5858

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

6666
using MagickImageCollection magickImageCollection = new(stream, settings);
67-
int imageWidth = magickImageCollection.Max(x => x.Width);
68-
int imageHeight = magickImageCollection.Max(x => x.Height);
67+
uint imageWidth = magickImageCollection.Max(x => x.Width);
68+
uint imageHeight = magickImageCollection.Max(x => x.Height);
6969

7070
List<ImageFrame<TPixel>> framesList = [];
7171
foreach (IMagickImage<ushort> magicFrame in magickImageCollection)
7272
{
73-
ImageFrame<TPixel> frame = new(configuration, imageWidth, imageHeight);
73+
ImageFrame<TPixel> frame = new(configuration, (int)imageWidth, (int)imageHeight);
7474
framesList.Add(frame);
7575

7676
Buffer2DRegion<TPixel> buffer = frame.PixelBuffer.GetRegion(
77-
imageWidth - magicFrame.Width,
78-
imageHeight - magicFrame.Height,
79-
magicFrame.Width,
80-
magicFrame.Height);
77+
(int)(imageWidth - magicFrame.Width),
78+
(int)(imageHeight - magicFrame.Height),
79+
(int)magicFrame.Width,
80+
(int)magicFrame.Height);
8181

8282
using IUnsafePixelCollection<ushort> pixels = magicFrame.GetPixelsUnsafe();
8383
if (magicFrame.Depth is 12 or 10 or 8 or 6 or 5 or 4 or 3 or 2 or 1)

0 commit comments

Comments
 (0)