Skip to content

Hotfix September RC #72

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

Merged
mee-ironsoftware merged 2 commits into from
Aug 23, 2023
Merged

Hotfix September RC #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
80a4f33
AnyBitmap: Fixes cannot create blank image with background color
mee-ironsoftware Aug 23, 2023
cf2a1ce
NuGet: Including SixLabors.ImageSharp.Drawing in package
mee-ironsoftware Aug 23, 2023
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
2 changes: 1 addition & 1 deletion ...ftware.Drawing/IronSoftware.Drawing.Common.Tests/IronSoftware.Drawing.Common.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<ItemGroup>
<PackageReference Include="FluentAssertions" Version="6.10.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta15" />
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0" />
<PackageReference Include="Microsoft.Maui.Graphics" Version="7.0.81" />
<PackageReference Include="SkiaSharp" Version="2.88.3" />
<PackageReference Include="System.Drawing.Common" Version="5.0.3" />
Expand Down
20 changes: 20 additions & 0 deletions IronSoftware.Drawing/IronSoftware.Drawing.Common.Tests/UnitTests/AnyBitmapFunctionality.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -802,6 +802,26 @@ public void Create_New_Image_Instance()
blankBitmap.Height.Should().Be(8);
}

[FactWithAutomaticDisplayName]
public void Create_New_Image_With_Background_Instance()
{
string blankBitmapPath = "blank_bitmap.bmp";
var bitmap = new AnyBitmap(8, 8, Color.DarkRed);
bitmap.SaveAs(blankBitmapPath);

AnyBitmap blankBitmap = AnyBitmap.FromFile(blankBitmapPath);

blankBitmap.Width.Should().Be(8);
blankBitmap.Height.Should().Be(8);
for (int i = 0; i < 8; i++)
{
for (int j = 0; j < 8; j++)
{
blankBitmap.GetPixel(i, j).Should().Be(Color.DarkRed);
}
}
}

[FactWithAutomaticDisplayName]
public void ExtractAlphaData_With32bppImage_ReturnsAlphaChannel()
{
Expand Down
4 changes: 2 additions & 2 deletions IronSoftware.Drawing/IronSoftware.Drawing.Common/IronSoftware.Drawing.Common.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<ItemGroup>
<PackageReference Include="BitMiracle.LibTiff.NET" Version="2.4.649" />
<PackageReference Include="Microsoft.Maui.Graphics" Version="7.0.81" />
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta15" />
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0" />
<PackageReference Include="SkiaSharp" Version="2.88.3" />
<PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.3" />
<PackageReference Include="SkiaSharp.Svg" Version="1.60.0" />
Expand All @@ -41,7 +41,7 @@
</When>
<Otherwise>
<ItemGroup>
<PackageReference Include="SixLabors.ImageSharp" Version="2.1.3" />
<PackageReference Include="SixLabors.ImageSharp" Version="2.1.5" />
</ItemGroup>
</Otherwise>
</Choose>
Expand Down
9 changes: 6 additions & 3 deletions NuGet/IronSoftware.Drawing.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,17 +44,20 @@ For general support and technical inquiries, please email us at: developers@iron
<repository type="git" url="https://github.com/iron-software/IronSoftware.Drawing.Common" commit="$commit$" />
<dependencies>
<group targetFramework="netstandard2.0">
<dependency id="SixLabors.ImageSharp" version="2.1.3" />
<dependency id="SixLabors.ImageSharp" version="2.1.5" />
<dependency id="SixLabors.ImageSharp.Drawing" version="1.0.0" />
<dependency id="BitMiracle.LibTiff.NET" version="2.4.649" />
<dependency id="System.Memory" version="4.5.5" />
</group>
<group targetFramework="net60">
<dependency id="SixLabors.ImageSharp" version="3.0.0" />
<dependency id="SixLabors.ImageSharp" version="3.0.1" />
<dependency id="SixLabors.ImageSharp.Drawing" version="1.0.0" />
<dependency id="BitMiracle.LibTiff.NET" version="2.4.649" />
<dependency id="System.Memory" version="4.5.5" />
</group>
<group targetFramework="netstandard2.1">
<dependency id="SixLabors.ImageSharp" version="2.1.3" />
<dependency id="SixLabors.ImageSharp" version="2.1.5" />
<dependency id="SixLabors.ImageSharp.Drawing" version="1.0.0" />
<dependency id="BitMiracle.LibTiff.NET" version="2.4.649" />
<dependency id="System.Memory" version="4.5.5" />
</group>
Expand Down