diff --git a/.gitignore b/.gitignore index 35063fc..ed5c47e 100644 --- a/.gitignore +++ b/.gitignore @@ -40,6 +40,8 @@ ScaffoldingReadMe.txt ~$* *~ CodeCoverage/ +.vs +Watermark.Net/.vs # MSBuild Binary and Structured Log *.binlog diff --git a/UnitTest/UnitTest.cs b/UnitTest/UnitTest.cs index 9dc8fb5..57f7b65 100644 --- a/UnitTest/UnitTest.cs +++ b/UnitTest/UnitTest.cs @@ -68,7 +68,7 @@ namespace UnitTest watermark.Position = Watermark.Net.src.WatermarkNet.Enums.ImagePosition.Center; watermark.Scale = 1; watermark.Pave = true; - var resultedImage = watermarker.ProcessDirectory("TestImages", watermark); + watermarker.ProcessDirectory("TestImages", watermark); Assert.IsTrue(Directory.GetFiles(watermarker.OutputDir)?.Length > 0); } diff --git a/Watermark.Net/src/WatermarkNet.Common/Watermarker.cs b/Watermark.Net/src/WatermarkNet.Common/Watermarker.cs index c7e36c0..46f77fd 100644 --- a/Watermark.Net/src/WatermarkNet.Common/Watermarker.cs +++ b/Watermark.Net/src/WatermarkNet.Common/Watermarker.cs @@ -230,13 +230,12 @@ namespace Watermark.Net.src.WatermarkNet.Core { case ImagePosition.TopCenter: return HorizontalAlignment.Center; - break; case ImagePosition.Center: return HorizontalAlignment.Center; - break; case ImagePosition.BottomCenter: return HorizontalAlignment.Center; - break; + default: + throw new ArgumentException("Image position must be provided."); } return HorizontalAlignment.Left; } @@ -257,7 +256,6 @@ namespace Watermark.Net.src.WatermarkNet.Core // Create a new font Font scaledFont = new Font(watermark.Font, scalingFactor / 16 * (watermark.Font.Size * watermark.Scale)); - ImagePosition[] centerImagePositions = { ImagePosition.CenterLeft, ImagePosition.CenterRight, ImagePosition.Center }; //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/Program.cs b/Watrmark.Net CLI/Program.cs index 62c790b..4f6efba 100644 --- a/Watrmark.Net CLI/Program.cs +++ b/Watrmark.Net CLI/Program.cs @@ -8,6 +8,8 @@ using Watrmark.Net_CLI.Watermak.Net.CLI.Constants; using Watrmark.Net_CLI; using System.Runtime.InteropServices; +//The CLI version is not fully ready yet. To be implemented in future + Parser.Default.ParseArguments(args) .WithParsed(option => { switch (option.WatermarkType) @@ -24,6 +26,8 @@ Parser.Default.ParseArguments(args) else ProccessDirectoryText(option); break; + default: + throw new ArgumentException("Watermark type not provided."); } })