Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/Controls/tests/TestCases.Shared.Tests/UITest.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System.Reflection;
using System.Text.RegularExpressions;
using ImageMagick;
using ImageMagick.Drawing;
using NUnit.Framework;
using NUnit.Framework.Constraints;
using UITest.Appium;
Expand Down Expand Up @@ -662,7 +663,7 @@ byte[] TakeScreenshot()
var bytes = App.Screenshot();

// Draw a rounded rectangle with the app window bounds as mask
using var surface = new MagickImage(MagickColors.Transparent, width, height);
using var surface = new MagickImage(MagickColors.Transparent, (uint)width, (uint)height);
new Drawables()
.RoundRectangle(0, 0, width, height, cornerRadius, cornerRadius)
.FillColor(MagickColors.Black)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ public MagickNetImageEditor(ImageSnapshot imageSnapshot)

public void Crop(int x, int y, int width, int height)
{
_magickImage.Crop(new MagickGeometry(x, y, width, height));
_magickImage.RePage();
_magickImage.Crop(new MagickGeometry(x, y, (uint)width, (uint)height));
_magickImage.ResetPage();
}

public (int width, int height) GetSize() =>
(_magickImage.Width, _magickImage.Height);
((int)_magickImage.Width, (int)_magickImage.Height);

public ImageSnapshot GetUpdatedImage()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public ImageDifference Compare(ImageSnapshot baselineImage, ImageSnapshot actual
var magickBaselineImage = new MagickImage(baselineImage.Data);
var magickActualImage = new MagickImage(actualImage.Data);

ImageSizeDifference imageSizeDifference = ImageSizeDifference.Compare(magickBaselineImage.Width, magickBaselineImage.Height, magickActualImage.Width, magickActualImage.Height);
ImageSizeDifference imageSizeDifference = ImageSizeDifference.Compare((int)magickBaselineImage.Width, (int)magickBaselineImage.Height, (int)magickActualImage.Width, (int)magickActualImage.Height);
if (imageSizeDifference != null)
return imageSizeDifference;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,10 @@ public ImageSnapshot GenerateDiff(ImageSnapshot baselineImage, ImageSnapshot act
var magickBaselineImage = new MagickImage(baselineImage.Data);
var magickActualImage = new MagickImage(actualImage.Data);

MagickImage magickDiffImage = new MagickImage();
var settings = new CompareSettings(_errorMetric);
using var magickDiffImage = magickBaselineImage.Compare(magickActualImage, settings, Channels.Red, out _);
magickDiffImage.Format = MagickFormat.Png;

double percentageDifference = magickBaselineImage.Compare(magickActualImage, _errorMetric, magickDiffImage, Channels.Red);

return new ImageSnapshot(magickDiffImage.ToByteArray(), ImageSnapshotFormat.PNG);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Magick.NET-Q8-AnyCPU" Version="13.5.0" />
<PackageReference Include="Magick.NET-Q8-AnyCPU" Version="14.10.2" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading