diff --git a/IronSoftware.Drawing/IronSoftware.Drawing.Common.Tests/UnitTests/AnyBitmapFunctionality.cs b/IronSoftware.Drawing/IronSoftware.Drawing.Common.Tests/UnitTests/AnyBitmapFunctionality.cs index 18569bc..ef91a05 100644 --- a/IronSoftware.Drawing/IronSoftware.Drawing.Common.Tests/UnitTests/AnyBitmapFunctionality.cs +++ b/IronSoftware.Drawing/IronSoftware.Drawing.Common.Tests/UnitTests/AnyBitmapFunctionality.cs @@ -121,7 +121,7 @@ public void Create_AnyBitmap_by_MemoryStream() [FactWithAutomaticDisplayName] public async void Create_AnyBitmap_by_Uri_Async() { - var uri = new Uri("https://upload.wikimedia.org/wikipedia/commons/thumb/e/ea/Van_Gogh_-_Starry_Night_-_Google_Art_Project.jpg/1200px-Van_Gogh_-_Starry_Night_-_Google_Art_Project.jpg"); + var uri = new Uri("https://ironsoftware.com/img/ironsoftware_hero_section/bg-hero-part.png"); AnyBitmap bitmap = await AnyBitmap.FromUriAsync(uri); _ = bitmap.TrySaveAs("result.bmp"); diff --git a/IronSoftware.Drawing/IronSoftware.Drawing.Common.Tests/UnitTests/FontFunctionality.cs b/IronSoftware.Drawing/IronSoftware.Drawing.Common.Tests/UnitTests/FontFunctionality.cs index e7b7ed5..8fbed46 100644 --- a/IronSoftware.Drawing/IronSoftware.Drawing.Common.Tests/UnitTests/FontFunctionality.cs +++ b/IronSoftware.Drawing/IronSoftware.Drawing.Common.Tests/UnitTests/FontFunctionality.cs @@ -371,7 +371,7 @@ public void CastFontTypes_from_Font_Should_throw_exception(string fontName, Font _ => fontName.Replace(" ", "") }; - Assert.Contains($"You have set a non PDF standatd FontType: {expectedFontName}, Please select one from IronSoftware.Drawing.FontTypes.", ex.Message); + Assert.Contains($"You have set a non-PDF standard FontType: {expectedFontName}, Please select one from IronSoftware.Drawing.FontTypes.", ex.Message); } #if !NETFRAMEWORK diff --git a/IronSoftware.Drawing/IronSoftware.Drawing.Common/AnyBitmap.cs b/IronSoftware.Drawing/IronSoftware.Drawing.Common/AnyBitmap.cs index 433df54..b323b3c 100644 --- a/IronSoftware.Drawing/IronSoftware.Drawing.Common/AnyBitmap.cs +++ b/IronSoftware.Drawing/IronSoftware.Drawing.Common/AnyBitmap.cs @@ -21,12 +21,13 @@ using System.Linq; using System.Net; using System.Net.Http; -using System.Reflection; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Threading; using System.Threading.Tasks; +using IronSoftware.Abstractions; + namespace IronSoftware.Drawing { /// diff --git a/IronSoftware.Drawing/IronSoftware.Drawing.Common/FontTypes.cs b/IronSoftware.Drawing/IronSoftware.Drawing.Common/FontTypes.cs index 5814c5e..cbcbad0 100644 --- a/IronSoftware.Drawing/IronSoftware.Drawing.Common/FontTypes.cs +++ b/IronSoftware.Drawing/IronSoftware.Drawing.Common/FontTypes.cs @@ -146,7 +146,7 @@ public static FontTypes FromString(string fontName) "TimesNewRoman-BoldItalic" => TimesNewRomanBoldItalic, "TimesNewRoman-Italic" => TimesNewRomanItalic, "ZapfDingbats" => ZapfDingbats, - _ => throw new System.InvalidCastException($"You have set a non PDF standatd FontType: {fontName}, Please select one from IronSoftware.Drawing.FontTypes.") + _ => throw new System.InvalidCastException($"You have set a non-PDF standard FontType: {fontName}, Please select one from IronSoftware.Drawing.FontTypes.") }; } } diff --git a/IronSoftware.Drawing/IronSoftware.Drawing.Common/IronSoftware.Drawing.Common.csproj b/IronSoftware.Drawing/IronSoftware.Drawing.Common/IronSoftware.Drawing.Common.csproj index cdbb9e1..32cde1b 100644 --- a/IronSoftware.Drawing/IronSoftware.Drawing.Common/IronSoftware.Drawing.Common.csproj +++ b/IronSoftware.Drawing/IronSoftware.Drawing.Common/IronSoftware.Drawing.Common.csproj @@ -1,55 +1,55 @@ - - - - IronSoftware.Drawing.Common.snk - Debug;Release - true - false - true - true - false - latest - CS8002 - AnyCPU - true - netstandard2.0;net60 - true - - - - AnyCPU - DEBUG;TRACE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - portable - true - - - + + + + IronSoftware.Drawing.Common.snk + Debug;Release + true + false + true + true + false + latest + CS8002 + AnyCPU + true + netstandard2.0;net60 + true + + + + AnyCPU + DEBUG;TRACE + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + portable + true + + + diff --git a/NuGet/IronSoftware.Drawing.nuspec b/NuGet/IronSoftware.Drawing.nuspec index 818dd7b..12a7730 100644 --- a/NuGet/IronSoftware.Drawing.nuspec +++ b/NuGet/IronSoftware.Drawing.nuspec @@ -1,75 +1,74 @@ - - - - IronSoftware.System.Drawing - $version$ - IronSoftware.System.Drawing - https://ironsoftware.com/ - - false - LICENSE.txt - https://github.com/iron-software/IronSoftware.Drawing.Common/ - images/ironsoftware-logo.png - docs\README.md - IronSoftware.System.Drawing - The C# Image Library - -A universally compatible Bitmap format for .NET 8, .NET 7, .NET 6, and .NET 5, .NET Core on Windows, macOS, Linux, Docker, AWS, Azure, NanoServer, IIS, Mobile, Xamarin, iOS, Android, and Google Compute. - -Works seamlessly with popular Image and Bitmap formats such as System.Drawing.Bitmap, SkiaSharp, SixLabors.ImageSharp, Microsoft.Maui.Graphics. - -Implicit casting means that using this class to input and output Bitmap and image types from public API's gives full compatibility to all image type fully supported by Microsoft. - -Key library features include: -* AnyBitmap: A universally compatible Bitmap class. Implicit casting between System.Drawing.Bitmap, System.Drawing.Image, SkiaSharp.SKBitmap, SkiaSharp.SKImage, SixLabors.ImageSharp, Microsoft.Maui.Graphics.Platform.PlatformImage to IronSoftware.Drawing.AnyBitmap -* Color: A universally compatible Color class. Implicit casting between System.Drawing.Color, SkiaSharp.SKColor, SixLabors.ImageSharp.Color, SixLabors.ImageSharp.PixelFormats to IronSoftware.Drawing.Color -* Rectangle: A universally compatible Rectangle class. Implicit casting between System.Drawing.Rectangle, SkiaSharp.SKRect, SkiaSharp.SKRectI, SixLabors.ImageSharp.Rectangle to IronSoftware.Drawing.Rectangle -* Font: A universally compatible Font class. Implicit casting between System.Drawing.Font, SkiaSharp.SKFont, SixLabors.Fonts.Font to IronSoftware.Drawing.Font -* Point: A universally compatible Point class. Implicit casting between System.Drawing.Point, SixLabors.ImageSharp.Point, SkiaSharp.SKPointI to IronSoftware.Drawing.Point -* Size: A universally compatible Size class. Implicit casting between System.Drawing.Size, SixLabors.ImageSharp.Size, SkiaSharp.SKSizeI to IronSoftware.Drawing.Size - -IronSoftware.Drawing can be used within C#, VB.NET, F#, ASP.NET projects, MVC, Web Services, Console & Desktop Applications. - -Supports: -* .NET 9 -* .NET 8 -* .NET 7 -* .NET 6 -* .NET 5 -* .NET Core 2.0 + -* .NET Framework 4.6.2 + - -For general support and technical inquiries, please email us at: support@ironsoftware.com - IronSoftware.System.Drawing is an open-source solution for .NET developers to replace System.Drawing.Common with a universal and flexible library. - - Optimizes AnyBitmap memory usage. - - Updates Color.FromName to align with System.Drawing. - - Adds support for RebeccaPurple color. - Copyright © Iron Software 2022-2025 - 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 - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + IronSoftware.System.Drawing + $version$ + IronSoftware.System.Drawing + https://ironsoftware.com/ + + false + LICENSE.txt + https://github.com/iron-software/IronSoftware.Drawing.Common/ + images/ironsoftware-logo.png + docs\README.md + IronSoftware.System.Drawing - The C# Image Library + +A universally compatible Bitmap format for .NET 8, .NET 7, .NET 6, and .NET 5, .NET Core on Windows, macOS, Linux, Docker, AWS, Azure, NanoServer, IIS, Mobile, Xamarin, iOS, Android, and Google Compute. + +Works seamlessly with popular Image and Bitmap formats such as System.Drawing.Bitmap, SkiaSharp, SixLabors.ImageSharp, Microsoft.Maui.Graphics. + +Implicit casting means that using this class to input and output Bitmap and image types from public API's gives full compatibility to all image type fully supported by Microsoft. + +Key library features include: +* AnyBitmap: A universally compatible Bitmap class. Implicit casting between System.Drawing.Bitmap, System.Drawing.Image, SkiaSharp.SKBitmap, SkiaSharp.SKImage, SixLabors.ImageSharp, Microsoft.Maui.Graphics.Platform.PlatformImage to IronSoftware.Drawing.AnyBitmap +* Color: A universally compatible Color class. Implicit casting between System.Drawing.Color, SkiaSharp.SKColor, SixLabors.ImageSharp.Color, SixLabors.ImageSharp.PixelFormats to IronSoftware.Drawing.Color +* Rectangle: A universally compatible Rectangle class. Implicit casting between System.Drawing.Rectangle, SkiaSharp.SKRect, SkiaSharp.SKRectI, SixLabors.ImageSharp.Rectangle to IronSoftware.Drawing.Rectangle +* Font: A universally compatible Font class. Implicit casting between System.Drawing.Font, SkiaSharp.SKFont, SixLabors.Fonts.Font to IronSoftware.Drawing.Font +* Point: A universally compatible Point class. Implicit casting between System.Drawing.Point, SixLabors.ImageSharp.Point, SkiaSharp.SKPointI to IronSoftware.Drawing.Point +* Size: A universally compatible Size class. Implicit casting between System.Drawing.Size, SixLabors.ImageSharp.Size, SkiaSharp.SKSizeI to IronSoftware.Drawing.Size + +IronSoftware.Drawing can be used within C#, VB.NET, F#, ASP.NET projects, MVC, Web Services, Console & Desktop Applications. + +Supports: +* .NET 9 +* .NET 8 +* .NET 7 +* .NET 6 +* .NET 5 +* .NET Core 2.0 + +* .NET Framework 4.6.2 + + +For general support and technical inquiries, please email us at: support@ironsoftware.com + IronSoftware.System.Drawing is an open-source solution for .NET developers to replace System.Drawing.Common with a universal and flexible library. + - Updates IronSoftware.Drawing.Abstractions to 2026.1.2. +- Updates SixLabors.ImageSharp to 2.1.13 (netstandard2.0) and 3.1.12 (net6.0). + Copyright © Iron Software 2022-2026 + 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file