Skip to content

Commit 30b3e45

Browse files
Merge pull request #133 from iron-software/releases/2025.5
[Develop] Releases/2025.5
2 parents 06d836c + ace14e7 commit 30b3e45

File tree

4 files changed

+32
-6
lines changed

4 files changed

+32
-6
lines changed

CI/job_templates/test_drawing_libraries.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,14 @@ jobs:
2020
buildType: 'current'
2121
artifactName: 'IronDrawingDataTests'
2222
targetPath: '$(Agent.BuildDirectory)/Data'
23+
- ${{ if or(eq(parameters.OSPlatform, 'Ubuntu'), eq(parameters.OSPlatform, 'Linux')) }}:
24+
- task: Bash@3
25+
displayName: 'Install GDI+ dependencies'
26+
inputs:
27+
targetType: 'inline'
28+
script: |
29+
sudo apt-get update
30+
sudo apt-get install -y libgdiplus libc6-dev
2331
- ${{ if eq(parameters.framework, 'netcoreapp3.1') }}:
2432
- task: UseDotNet@2
2533
displayName: 'Install .Netcoreapp3.1 Core sdk'

IronSoftware.Drawing/IronSoftware.Drawing.Common/AnyBitmap.cs

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2233,6 +2233,21 @@ private static SKBitmap OpenTiffToSKBitmap(AnyBitmap anyBitmap)
22332233
}
22342234
}
22352235

2236+
/// <summary>
2237+
/// Disable warning message written to console by BitMiracle.LibTiff.NET.
2238+
/// </summary>
2239+
private class DisableErrorHandler : TiffErrorHandler
2240+
{
2241+
public override void WarningHandler(Tiff tif, string method, string format, params object[] args)
2242+
{
2243+
// do nothing, ie, do not write warnings to console
2244+
}
2245+
public override void WarningHandlerExt(Tiff tif, object clientData, string method, string format, params object[] args)
2246+
{
2247+
// do nothing ie, do not write warnings to console
2248+
}
2249+
}
2250+
22362251
private void OpenTiffToImageSharp(ReadOnlySpan<byte> bytes)
22372252
{
22382253
try
@@ -2246,6 +2261,9 @@ private void OpenTiffToImageSharp(ReadOnlySpan<byte> bytes)
22462261
// create a memory stream out of them
22472262
using MemoryStream tiffStream = new(bytes.ToArray());
22482263

2264+
// Disable warning messages
2265+
Tiff.SetErrorHandler(new DisableErrorHandler());
2266+
22492267
// open a TIFF stored in the stream
22502268
using (Tiff tiff = Tiff.ClientOpen("in-memory", "r", tiffStream, new TiffStream()))
22512269
{

IronSoftware.Drawing/IronSoftware.Drawing.Common/IronSoftware.Drawing.Common.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<AssemblyOriginatorKeyFile>IronSoftware.Drawing.Common.snk</AssemblyOriginatorKeyFile>
@@ -25,7 +25,7 @@
2525
<PackageReference Include="BitMiracle.LibTiff.NET" Version="2.4.649" />
2626
<PackageReference Include="Microsoft.Maui.Graphics" Version="7.0.92" />
2727
<PackageReference Include="SkiaSharp" Version="2.88.7" />
28-
<PackageReference Include="IronSoftware.Drawing.Abstractions" Version="2025.2.6" />
28+
<PackageReference Include="IronSoftware.Drawing.Abstractions" Version="2025.4.2" />
2929
<PackageReference Include="SkiaSharp.Svg" Version="1.60.0" />
3030
<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
3131
<PackageReference Include="System.Memory" Version="4.5.5" />

NuGet/IronSoftware.Drawing.nuspec

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,21 +39,21 @@ Supports:
3939

4040
For general support and technical inquiries, please email us at: support@ironsoftware.com</description>
4141
<summary>IronSoftware.System.Drawing is an open-source solution for .NET developers to replace System.Drawing.Common with a universal and flexible library.</summary>
42-
<releaseNotes>- Fixes incorrect HorizontalResolution and VerticalResolution of AnyBitmap images.
43-
- Improves library's internal functionality and performance.</releaseNotes>
42+
<releaseNotes>- Updates internal dependencies.
43+
- Disable warning messages from BitMiracle.LibTiff.NET.</releaseNotes>
4444
<copyright>Copyright © Iron Software 2022-2025</copyright>
4545
<tags>Images, Bitmap, SkiaSharp, SixLabors, BitMiracle, Maui, SVG, TIFF, TIF, GIF, JPEG, PNG, Color, Rectangle, Drawing, C#, VB.NET, ASPX, create, render, generate, standard, netstandard2.0, core, netcore</tags>
4646
<repository type="git" url="https://github.com/iron-software/IronSoftware.Drawing.Common" commit="$commit$" />
4747
<dependencies>
4848
<group targetFramework="netstandard2.0">
49-
<dependency id="IronSoftware.Drawing.Abstractions" version="2025.2.6" />
49+
<dependency id="IronSoftware.Drawing.Abstractions" version="2025.4.2" />
5050
<dependency id="SixLabors.ImageSharp" version="2.1.10" />
5151
<dependency id="SixLabors.ImageSharp.Drawing" version="1.0.0" />
5252
<dependency id="BitMiracle.LibTiff.NET" version="2.4.649" />
5353
<dependency id="System.Memory" version="4.5.5" />
5454
</group>
5555
<group targetFramework="net60">
56-
<dependency id="IronSoftware.Drawing.Abstractions" version="2025.2.6" />
56+
<dependency id="IronSoftware.Drawing.Abstractions" version="2025.4.2" />
5757
<dependency id="SixLabors.ImageSharp" version="3.1.7" />
5858
<dependency id="SixLabors.ImageSharp.Drawing" version="2.1.5" />
5959
<dependency id="BitMiracle.LibTiff.NET" version="2.4.649" />

0 commit comments

Comments
 (0)