Fix GraphicsOptions

src/ImageSharp.Drawing/Common/Extensions/GraphicsOptionsExtensions.cs

@@ -0,0 +1,53 @@
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+using System.Numerics;
+using SixLabors.ImageSharp.PixelFormats;
+
+namespace SixLabors.ImageSharp
+{
+    /// <summary>
+    /// Extensions methods fpor the <see cref="GraphicsOptions"/> class.
+    /// </summary>
+    internal static class GraphicsOptionsExtensions
+    {
+        /// <summary>
+        /// Evaluates if a given SOURCE color can completely replace a BACKDROP color given the current blending and composition settings.
+        /// </summary>
+        /// <param name="options">The graphics options.</param>
+        /// <param name="color">The source color.</param>
+        /// <returns>true if the color can be considered opaque</returns>
+        /// <remarks>
+        /// Blending and composition is an expensive operation, in some cases, like
+        /// filling with a solid color, the blending can be avoided by a plain color replacement.
+        /// This method can be useful for such processors to select the fast path.
+        /// </remarks>
+        public static bool IsOpaqueColorWithoutBlending(this GraphicsOptions options, Color color)
+        {
+            if (options.ColorBlendingMode != PixelColorBlendingMode.Normal)
+            {
+                return false;
+            }
+
+            if (options.AlphaCompositionMode != PixelAlphaCompositionMode.SrcOver
+                && options.AlphaCompositionMode != PixelAlphaCompositionMode.Src)
+            {
+                return false;
+            }
+
+            const float Opaque = 1F;
+
+            if (options.BlendPercentage != Opaque)
+            {
+                return false;
+            }
+
+            if (((Vector4)color).W != Opaque)
+            {
+                return false;
+            }
+
+            return true;
+        }
+    }
+}

src/ImageSharp/GraphicsOptions.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Six Labors and contributors.
+// Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
@@ -21,18 +21,14 @@ namespace SixLabors.ImageSharp
 
         private bool? antialias;
 
-        private PixelColorBlendingMode colorBlendingMode;
-
-        private PixelAlphaCompositionMode alphaCompositionMode;
-
         /// <summary>
         /// Initializes a new instance of the <see cref="GraphicsOptions"/> struct.
         /// </summary>
         /// <param name="enableAntialiasing">If set to <c>true</c> [enable antialiasing].</param>
         public GraphicsOptions(bool enableAntialiasing)
         {
-            this.colorBlendingMode = PixelColorBlendingMode.Normal;
+            this.ColorBlendingMode = PixelColorBlendingMode.Normal;
-            this.alphaCompositionMode = PixelAlphaCompositionMode.SrcOver;
+            this.AlphaCompositionMode = PixelAlphaCompositionMode.SrcOver;
             this.blendPercentage = 1;
             this.antialiasSubpixelDepth = 16;
             this.antialias = enableAntialiasing;
@@ -47,8 +43,8 @@ namespace SixLabors.ImageSharp
         {
             Guard.MustBeBetweenOrEqualTo(opacity, 0, 1, nameof(opacity));
 
-            this.colorBlendingMode = PixelColorBlendingMode.Normal;
+            this.ColorBlendingMode = PixelColorBlendingMode.Normal;
-            this.alphaCompositionMode = PixelAlphaCompositionMode.SrcOver;
+            this.AlphaCompositionMode = PixelAlphaCompositionMode.SrcOver;
             this.blendPercentage = opacity;
             this.antialiasSubpixelDepth = 16;
             this.antialias = enableAntialiasing;
@@ -64,8 +60,8 @@ namespace SixLabors.ImageSharp
         {
             Guard.MustBeBetweenOrEqualTo(opacity, 0, 1, nameof(opacity));
 
-            this.colorBlendingMode = blending;
+            this.ColorBlendingMode = blending;
-            this.alphaCompositionMode = PixelAlphaCompositionMode.SrcOver;
+            this.AlphaCompositionMode = PixelAlphaCompositionMode.SrcOver;
             this.blendPercentage = opacity;
             this.antialiasSubpixelDepth = 16;
             this.antialias = enableAntialiasing;
@@ -82,8 +78,8 @@ namespace SixLabors.ImageSharp
         {
             Guard.MustBeBetweenOrEqualTo(opacity, 0, 1, nameof(opacity));
 
-            this.colorBlendingMode = blending;
+            this.ColorBlendingMode = blending;
-            this.alphaCompositionMode = composition;
+            this.AlphaCompositionMode = composition;
             this.blendPercentage = opacity;
             this.antialiasSubpixelDepth = 16;
             this.antialias = enableAntialiasing;
@@ -123,55 +119,11 @@ namespace SixLabors.ImageSharp
         /// <summary>
         /// Gets or sets a value indicating the color blending mode to apply to the drawing operation
         /// </summary>
-        public PixelColorBlendingMode ColorBlendingMode
+        public PixelColorBlendingMode ColorBlendingMode { get; set; }
-        {
-            get => this.colorBlendingMode;
-            set => this.colorBlendingMode = value;
-        }
 
         /// <summary>
         /// Gets or sets a value indicating the alpha composition mode to apply to the drawing operation
         /// </summary>
-        public PixelAlphaCompositionMode AlphaCompositionMode
+        public PixelAlphaCompositionMode AlphaCompositionMode { get; set; }
-        {
-            get => this.alphaCompositionMode;
-            set => this.alphaCompositionMode = value;
-        }
-
-        /// <summary>
-        /// Evaluates if a given SOURCE color can completely replace a BACKDROP color given the current blending and composition settings.
-        /// </summary>
-        /// <param name="color">the color</param>
-        /// <returns>true if the color can be considered opaque</returns>
-        /// <remarks>
-        /// Blending and composition is an expensive operation, in some cases, like
-        /// filling with a solid color, the blending can be avoided by a plain color replacement.
-        /// This method can be useful for such processors to select the fast path.
-        /// </remarks>
-        internal bool IsOpaqueColorWithoutBlending(Color color)
-        {
-            if (this.ColorBlendingMode != PixelColorBlendingMode.Normal)
-            {
-                return false;
-            }
-
-            if (this.AlphaCompositionMode != PixelAlphaCompositionMode.SrcOver &&
-                this.AlphaCompositionMode != PixelAlphaCompositionMode.Src)
-            {
-                return false;
-            }
-
-            if (this.BlendPercentage != 1f)
-            {
-                return false;
-            }
-
-            if (color.ToVector4().W != 1f)
-            {
-                return false;
-            }
-
-            return true;
-        }
     }
-}
+}