diff --git a/UnitTest/UnitTest.csproj b/UnitTest/UnitTest.csproj index a14f794..020f238 100644 --- a/UnitTest/UnitTest.csproj +++ b/UnitTest/UnitTest.csproj @@ -15,6 +15,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all + diff --git a/Watermark.Net/Watermark.Net.csproj b/Watermark.Net/Watermark.Net.csproj index 5cd7032..911d3a5 100644 --- a/Watermark.Net/Watermark.Net.csproj +++ b/Watermark.Net/Watermark.Net.csproj @@ -14,7 +14,7 @@ - + diff --git a/Watermark.Net/src/WatermarkNet.Common/Watermarker.cs b/Watermark.Net/src/WatermarkNet.Common/Watermarker.cs index a382866..a8e6d9d 100644 --- a/Watermark.Net/src/WatermarkNet.Common/Watermarker.cs +++ b/Watermark.Net/src/WatermarkNet.Common/Watermarker.cs @@ -255,7 +255,7 @@ namespace Watermark.Net.src.WatermarkNet.Core float scalingFactor = Math.Min(imgSize.Width / size.Width, imgSize.Height / size.Height); // Create a new font - Font scaledFont = new Font(watermark.Font, scalingFactor / 16 * (watermark.Font.Size * watermark.Scale)); + SixLabors.Fonts.Font scaledFont = new SixLabors.Fonts.Font(watermark.Font, scalingFactor / 16 * (watermark.Font.Size * watermark.Scale)); //processingContext.SetGraphicsOptions(new GraphicsOptions { AlphaCompositionMode = SixLabors.ImageSharp.PixelFormats.PixelAlphaCompositionMode.Clear}); //If set, apply backround color if (watermark.BackroundColor != null) diff --git a/Watrmark.Net CLI/Watrmark.Net CLI.csproj b/Watrmark.Net CLI/Watrmark.Net CLI.csproj index d3347d5..956212c 100644 --- a/Watrmark.Net CLI/Watrmark.Net CLI.csproj +++ b/Watrmark.Net CLI/Watrmark.Net CLI.csproj @@ -12,6 +12,7 @@ +