Skip to content

Port the ImageMagick sample to .NET 10 and Magick.NET 15 #2337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vladimir-pecanac-main wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Port the ImageMagick sample to .NET 10 and Magick.NET 15 #2337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions ...mages/GenerateImagesInCSharpUsingImageMagick/ImageMagickLibrary/ImageMagickLibrary.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Magick.NET-Q8-AnyCPU" Version="13.6.0" />
<PackageReference Include="Magick.NET-Q8-AnyCPU" Version="15.0.0" />
</ItemGroup>

</Project>
3 changes: 2 additions & 1 deletion csharp-images/GenerateImagesInCSharpUsingImageMagick/ImageMagickLibrary/ImageService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
using ImageMagick;
using ImageMagick.Drawing;

namespace ImageMagickLibrary;

public static class ImageService
{
public static MagickImage CreateBlankImage(int width, int height, MagickColor color)
public static MagickImage CreateBlankImage(uint width, uint height, MagickColor color)
{
return new MagickImage(color, width, height);
}
Expand Down
4 changes: 2 additions & 2 deletions csharp-images/GenerateImagesInCSharpUsingImageMagick/ImageMagickLibrary/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@

string outputPath = @"outputImage.png";

var image = ImageService.CreateBlankImage(480, 300, MagickColors.AliceBlue);
using var image = ImageService.CreateBlankImage(480, 300, MagickColors.AliceBlue);
var strokeColor = MagickColors.YellowGreen;
var fillColor = MagickColors.Transparent;
var circle = ImageService.CreateCircle(image.Width / 2, image.Height / 2, 100, 5, strokeColor, fillColor);
var circle = ImageService.CreateCircle((int)image.Width / 2, (int)image.Height / 2, 100, 5, strokeColor, fillColor);
ImageService.DrawOnImage(image, circle);
ImageService.SaveImage(image, outputPath);

Expand Down
12 changes: 6 additions & 6 deletions ...agick/Tests/ImageMagickLibraryLiveTest.cs → ...geMagick/Tests/ImageMagickLibraryTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

namespace Tests;

public class ImageMagickLibraryLiveTest
public class ImageMagickLibraryTests
{
private const string OutputPath = @"outputImage.png";
private const string NullOutputPath = "";
Expand All @@ -18,12 +18,12 @@ public class ImageMagickLibraryLiveTest
private readonly int _invalidPointX = -1;
private readonly int _invalidPointY = -1;

public ImageMagickLibraryLiveTest()
public ImageMagickLibraryTests()
{
_expectedColor = _color;
_centerX = _circle.X + _circle.Width / 2;
_centerY = _circle.Y + _circle.Height / 2;
_radius = _circle.Width / 2;
_centerX = _circle.X + (int)_circle.Width / 2;
_centerY = _circle.Y + (int)_circle.Height / 2;
_radius = (int)_circle.Width / 2;
_strokeWidth = 5;
}

Expand Down Expand Up @@ -53,7 +53,7 @@ public void GivenValidSize_WhenCreateBlankImage_ThenReturnMagickImage()
[Theory]
[InlineData(0, 200)]
[InlineData(400, 0)]
public void GivenInvalidSize_WhenCreateBlankImage_ThenThrowArgumentException(int width, int height)
public void GivenInvalidSize_WhenCreateBlankImage_ThenThrowArgumentException(uint width, uint height)
{
// Arrange, Act & Assert
Assert.Throws<ArgumentException>(() => ImageService.CreateBlankImage(width, height, MagickColors.White));
Expand Down
10 changes: 5 additions & 5 deletions csharp-images/GenerateImagesInCSharpUsingImageMagick/Tests/Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

Expand All @@ -10,10 +10,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="coverlet.collector" Version="6.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="xunit" Version="2.5.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" />
<PackageReference Include="coverlet.collector" Version="10.1.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.11.0" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="4.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading