minor cleanup for code consistency, use more pattern matching

Author: saucecontrol

src/MagicScaler/Core/ImageFileInfo.cs

@@ -62,7 +62,7 @@ public ImageFileInfo(Stream imgStream) : this(imgStream, DateTime.MinValue) { }
 
 		public ImageFileInfo(Stream imgStream, DateTime lastModified)
 		{
-			if (imgStream == null) throw new ArgumentNullException(nameof(imgStream));
+			if (imgStream is null) throw new ArgumentNullException(nameof(imgStream));
 			if (!imgStream.CanSeek || !imgStream.CanRead) throw new ArgumentException("Input Stream must allow Seek and Read", nameof(imgStream));
 			if (imgStream.Length <= 0 || imgStream.Position >= imgStream.Length) throw new ArgumentException("Input Stream is empty or positioned at its end", nameof(imgStream));
 
@@ -83,8 +83,8 @@ private void loadInfo(WicDecoder dec, WicProcessingContext ctx)
 				var frm = new WicFrameReader(ctx);
 				WicTransforms.AddMetadataReader(ctx, basicOnly: true);
 
-				int width = (int)(frm.ExifOrientation.SwapDimensions() ? ctx.Source.Height : ctx.Source.Width);
-				int height = (int)(frm.ExifOrientation.SwapDimensions() ? ctx.Source.Width : ctx.Source.Height);
+				int width = (int)(frm.ExifOrientation.RequiresDimensionSwap() ? ctx.Source.Height : ctx.Source.Width);
+				int height = (int)(frm.ExifOrientation.RequiresDimensionSwap() ? ctx.Source.Width : ctx.Source.Height);
 				Frames[i] = new FrameInfo(width, height, ctx.Source.Format.AlphaRepresentation != PixelAlphaRepresentation.None, frm.ExifOrientation);
 			}
 		}

src/MagicScaler/Core/PixelFormats.cs

@@ -64,15 +64,13 @@ internal struct PixelFormat : IEquatable<PixelFormat>
 		public override bool Equals(object o) => o is PixelFormat pf ? Equals(pf) : false;
 		public override int GetHashCode() => FormatGuid.GetHashCode();
 
-		public bool IsBinaryCompatibleWith(PixelFormat other)
-		{
-			return BitsPerPixel == other.BitsPerPixel &&
-			       ChannelCount == other.ChannelCount &&
-			       NumericRepresentation == other.NumericRepresentation &&
-			       ColorRepresentation == other.ColorRepresentation &&
-			       AlphaRepresentation == other.AlphaRepresentation &&
-			       Colorspace == other.Colorspace;
-		}
+		public bool IsBinaryCompatibleWith(PixelFormat other) =>
+			BitsPerPixel == other.BitsPerPixel &&
+			ChannelCount == other.ChannelCount &&
+			NumericRepresentation == other.NumericRepresentation &&
+			ColorRepresentation == other.ColorRepresentation &&
+			AlphaRepresentation == other.AlphaRepresentation &&
+			Colorspace == other.Colorspace;
 
 		public static readonly PixelFormat Grey16BppUQ15 = new PixelFormat {
 			FormatGuid = new Guid(0xC175220D, 0x375B, 0x48C9, 0x8D, 0xD9, 0x1D, 0x28, 0x24, 0xFE, 0x88, 0x9F),
@@ -272,7 +270,7 @@ static PixelFormat()
 					uint cch = pix.GetFriendlyName(0, null);
 					var sbn = new StringBuilder((int)cch);
 					pix.GetFriendlyName(cch, sbn);
-					var pfn = sbn.ToString();
+					string pfn = sbn.ToString();
 
 					var fmt = new PixelFormat {
 						FormatGuid = pix.GetFormatGUID(),

src/MagicScaler/Core/ProcessImageSettings.cs

@@ -19,7 +19,7 @@ namespace PhotoSauce.MagicScaler
 	public enum CropAnchor { Center = 0, Top = 1, Bottom = 2, Left = 4, Right = 8 }
 	public enum CropScaleMode { Crop, Max, Stretch, Pad }
 	public enum HybridScaleMode { FavorQuality, FavorSpeed, Turbo, Off }
-	public enum GammaMode { Linear, sRGB }
+	public enum GammaMode { Linear, Companded, [Obsolete]sRGB = 1 }
 	public enum ChromaSubsampleMode { Default = 0, Subsample420 = 1, Subsample422 = 2, Subsample444 = 3 }
 	public enum FileFormat { Auto, Jpeg, Png, Png8, Gif, Bmp, Tiff, Unknown = Auto }
 	public enum OrientationMode { Normalize, Preserve, Ignore = 0xff }
@@ -56,7 +56,7 @@ public readonly struct InterpolationSettings
 		public static readonly InterpolationSettings Spline36 = new InterpolationSettings(new Spline36Interpolator());
 
 		private readonly double blur;
-		public double Blur => WeightingFunction == null ? default : WeightingFunction.Support * blur < 0.5 ? 1d : blur;
+		public double Blur => WeightingFunction is null ? default : WeightingFunction.Support * blur < 0.5 ? 1d : blur;
 
 		public IInterpolator WeightingFunction { get; }
 
@@ -182,10 +182,7 @@ public ChromaSubsampleMode JpegSubsampleMode
 
 				return JpegQuality >= 95 ? ChromaSubsampleMode.Subsample444 : JpegQuality >= 91 ? ChromaSubsampleMode.Subsample422 : ChromaSubsampleMode.Subsample420;
 			}
-			set
-			{
-				jpegSubsampling = value;
-			}
+			set => jpegSubsampling = value;
 		}
 
 		public InterpolationSettings Interpolation
@@ -207,10 +204,7 @@ public InterpolationSettings Interpolation
 
 				return interpolator;
 			}
-			set
-			{
-				interpolation = value;
-			}
+			set => interpolation = value;
 		}
 
 		public UnsharpMaskSettings UnsharpMask
@@ -240,10 +234,7 @@ public UnsharpMaskSettings UnsharpMask
 				else
 					return new UnsharpMaskSettings(150, 0.5, 0);
 			}
-			set
-			{
-				unsharpMask = value;
-			}
+			set => unsharpMask = value;
 		}
 
 		public static ProcessImageSettings FromDictionary(IDictionary<string, string> dic)
@@ -280,7 +271,7 @@ public static ProcessImageSettings FromDictionary(IDictionary<string, string> di
 				s.JpegSubsampleMode = Enum.TryParse(string.Concat("Subsample", cap.Value), true, out ChromaSubsampleMode csub) ? csub : s.JpegSubsampleMode;
 
 			string color = dic.GetValueOrDefault("bgcolor") ?? dic.GetValueOrDefault("bg");
-			if (color != null)
+			if (!string.IsNullOrWhiteSpace(color))
 			{
 				if (hexColorExpression.Value.IsMatch(color))
 					color = string.Concat('#', color);
@@ -427,7 +418,7 @@ internal void NormalizeFrom(ImageFileInfo img)
 
 			var frame = img.Frames[FrameIndex];
 
-			Fixup(frame.Width, frame.Height, OrientationMode != OrientationMode.Normalize && frame.ExifOrientation.SwapDimensions());
+			Fixup(frame.Width, frame.Height, OrientationMode != OrientationMode.Normalize && frame.ExifOrientation.RequiresDimensionSwap());
 
 			if (SaveFormat == FileFormat.Auto)
 				SetSaveFormat(img.ContainerType, frame.HasAlpha);

src/MagicScaler/Interop/PropVariant.cs

@@ -66,7 +66,7 @@ public enum PropVariantMarshalType { Automatic, Ascii, Blob }
 
 		private static VarEnum getUnmanagedType(object o, PropVariantMarshalType marshalType)
 		{
-			if (o == null) return VarEnum.VT_EMPTY;
+			if (o is null) return VarEnum.VT_EMPTY;
 			if (Marshal.IsComObject(o)) return VarEnum.VT_UNKNOWN;
 			if (o is PropVariant pv) return pv.UnmanagedType;
 
@@ -182,7 +182,7 @@ public void CleanUpNativeData(IntPtr pNativeData)
 
 			unsafe public IntPtr MarshalManagedToNative(object o)
 			{
-				if (o == null)
+				if (o is null)
 					return IntPtr.Zero;
 
 				var marshalType = PropVariantMarshalType.Automatic;
@@ -198,7 +198,7 @@ unsafe public IntPtr MarshalManagedToNative(object o)
 				var pNativeData = Marshal.AllocCoTaskMem(cbNative);
 				Unsafe.InitBlock(pNativeData.ToPointer(), default, (uint)cbNative);
 
-				if (o == null)
+				if (o is null)
 					return pNativeData;
 
 				if (!(o is Array))
@@ -262,7 +262,7 @@ unsafe public IntPtr MarshalManagedToNative(object o)
 
 			public object MarshalNativeToManaged(IntPtr pNativeData)
 			{
-				if ((pNativeData == IntPtr.Zero) || (pv == null))
+				if ((pNativeData == IntPtr.Zero) || (pv is null))
 					return null;
 
 				var upv = Marshal.PtrToStructure<UnmanagedPropVariant>(pNativeData);

src/MagicScaler/Magic/ConvolutionTransform.cs

@@ -123,10 +123,8 @@ unsafe protected override void CopyPixelsInternal(WICRect prc, uint cbStride, ui
 			}
 		}
 
-		unsafe protected virtual void ConvolveLine(byte* bstart, byte* wstart, byte* tstart, byte* ostart, byte* pmapy, int smapy, int ox, int oy, int ow)
-		{
+		unsafe protected virtual void ConvolveLine(byte* bstart, byte* wstart, byte* tstart, byte* ostart, byte* pmapy, int smapy, int ox, int oy, int ow) =>
 			YProcessor.WriteDestLine(tstart, ostart, ox, ow, pmapy, smapy);
-		}
 
 		unsafe protected void LoadBuffer(byte* bstart, byte* wstart, byte* tstart, byte* mapxstart, int iy)
 		{

src/MagicScaler/Magic/FormatConversionTransform.cs

@@ -798,7 +798,13 @@ public sealed class FormatConversionTransform : PixelTransform, IPixelTransformI
 	{
 		private readonly Guid outFormat;
 
-		public FormatConversionTransform(Guid outFormat) => this.outFormat = outFormat;
+		public FormatConversionTransform(Guid outFormat)
+		{
+			if (outFormat != PixelFormats.Grey8bpp && outFormat != PixelFormats.Bgr24bpp && outFormat != PixelFormats.Bgra32bpp)
+				throw new NotSupportedException("Unsupported pixel format");
+
+			this.outFormat = outFormat;
+		}
 
 		void IPixelTransformInternal.Init(WicProcessingContext ctx)
 		{

src/MagicScaler/Magic/KernelMap.cs

@@ -26,21 +26,20 @@ unsafe private static T convertWeight(double d)
 		{
 			var w = default(T);
 			if (typeof(T) == typeof(int))
-				Unsafe.Write(Unsafe.AsPointer(ref w), MathUtil.Fix15(d));
+				Unsafe.Write(&w, MathUtil.Fix15(d));
 			else if (typeof(T) == typeof(float))
-				Unsafe.Write(Unsafe.AsPointer(ref w), (float)d);
+				Unsafe.Write(&w, (float)d);
 
 			return w;
 		}
 
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
-		unsafe private static void addWeight(ref T a, void* b)
+		unsafe private static void addWeight(T* a, void* b)
 		{
-			void* ap = Unsafe.AsPointer(ref a);
 			if (typeof(T) == typeof(int))
-				Unsafe.Write(ap, Unsafe.Read<int>(ap) + Unsafe.Read<int>(b));
+				Unsafe.Write(a, Unsafe.Read<int>(a) + Unsafe.Read<int>(b));
 			else if (typeof(T) == typeof(float))
-				Unsafe.Write(ap, Unsafe.Read<float>(ap) + Unsafe.Read<float>(b));
+				Unsafe.Write(a, Unsafe.Read<float>(a) + Unsafe.Read<float>(b));
 		}
 
 		unsafe private static void fillKernelWeights(IInterpolator interpolator, double* kernel, int ksize, double start, double center, double scale)
@@ -99,7 +98,7 @@ unsafe private KernelMap<T> clamp()
 						{
 							var a = default(T);
 							for (int j = 0; j <= o; j++)
-								addWeight(ref a, mpw + j * chan + k);
+								addWeight(&a, mpw + j * chan + k);
 
 							Unsafe.Write(mpw + k, a);
 
@@ -117,7 +116,7 @@ unsafe private KernelMap<T> clamp()
 						{
 							var a = default(T);
 							for (int j = 0; j <= o; j++)
-								addWeight(ref a, mpw + last * chan - j * chan + k);
+								addWeight(&a, mpw + last * chan - j * chan + k);
 
 							Unsafe.Write(mpw + last * chan + k, a);
 

src/MagicScaler/Magic/MagicImageProcessor.cs

@@ -13,20 +13,20 @@ public static class MagicImageProcessor
 
 		private static void checkInStream(Stream imgStream)
 		{
-			if (imgStream == null) throw new ArgumentNullException(nameof(imgStream));
+			if (imgStream is null) throw new ArgumentNullException(nameof(imgStream));
 			if (!imgStream.CanSeek || !imgStream.CanRead) throw new ArgumentException("Input Stream must allow Seek and Read", nameof(imgStream));
 			if (imgStream.Length <= 0 || imgStream.Position >= imgStream.Length) throw new ArgumentException("Input Stream is empty or positioned at its end", nameof(imgStream));
 		}
 
 		private static void checkOutStream(Stream outStream)
 		{
-			if (outStream == null) throw new ArgumentNullException(nameof(outStream));
+			if (outStream is null) throw new ArgumentNullException(nameof(outStream));
 			if (!outStream.CanSeek || !outStream.CanWrite) throw new ArgumentException("Output Stream must allow Seek and Write", nameof(outStream));
 		}
 
 		public static ProcessImageResult ProcessImage(string imgPath, Stream outStream, ProcessImageSettings settings)
 		{
-			if (imgPath == null) throw new ArgumentNullException(nameof(imgPath));
+			if (imgPath is null) throw new ArgumentNullException(nameof(imgPath));
 			checkOutStream(outStream);
 
 			using (var ctx = new WicProcessingContext(settings))
@@ -65,7 +65,7 @@ public static ProcessImageResult ProcessImage(Stream imgStream, Stream outStream
 
 		public static ProcessImageResult ProcessImage(IPixelSource imgSource, Stream outStream, ProcessImageSettings settings)
 		{
-			if (imgSource == null) throw new ArgumentNullException(nameof(imgSource));
+			if (imgSource is null) throw new ArgumentNullException(nameof(imgSource));
 			checkOutStream(outStream);
 
 			using (var ctx = new WicProcessingContext(settings))
@@ -78,7 +78,7 @@ public static ProcessImageResult ProcessImage(IPixelSource imgSource, Stream out
 
 		public static ProcessingPipeline BuildPipeline(string imgPath, ProcessImageSettings settings)
 		{
-			if (imgPath == null) throw new ArgumentNullException(nameof(imgPath));
+			if (imgPath is null) throw new ArgumentNullException(nameof(imgPath));
 
 			var ctx = new WicProcessingContext(settings);
 			var dec = new WicDecoder(imgPath, ctx);
@@ -108,18 +108,16 @@ public static ProcessingPipeline BuildPipeline(Stream imgStream, ProcessImageSet
 
 		public static ProcessingPipeline BuildPipeline(IPixelSource imgSource, ProcessImageSettings settings)
 		{
-			if (imgSource == null) throw new ArgumentNullException(nameof(imgSource));
+			if (imgSource is null) throw new ArgumentNullException(nameof(imgSource));
 
 			var ctx = new WicProcessingContext(settings);
 			var dec = new WicDecoder(imgSource, ctx);
 			buildPipeline(ctx, false);
 			return new ProcessingPipeline(ctx);
 		}
 
-		public static ProcessImageResult ExecutePipeline(this ProcessingPipeline pipeline, Stream outStream)
-		{
-			return executePipeline(pipeline.Context, outStream);
-		}
+		public static ProcessImageResult ExecutePipeline(this ProcessingPipeline pipeline, Stream outStream) =>
+			executePipeline(pipeline.Context, outStream);
 
 		private static void buildPipeline(WicProcessingContext ctx, bool outputPlanar = true)
 		{
@@ -136,7 +134,7 @@ private static void buildPipeline(WicProcessingContext ctx, bool outputPlanar =
 				bool savePlanar = outputPlanar
 					&& ctx.Settings.SaveFormat == FileFormat.Jpeg
 					&& ctx.Settings.InnerRect == ctx.Settings.OuterRect
-					&& ctx.SourceColorContext == null;
+					&& ctx.SourceColorContext is null;
 
 				WicTransforms.AddExifRotator(ctx);
 				WicTransforms.AddPlanarCache(ctx);

src/MagicScaler/Magic/PadTransform.cs

@@ -11,7 +11,7 @@ namespace PhotoSauce.MagicScaler
 {
 	internal class PadTransform : PixelSource
 	{
-		private readonly int Bpp;
+		private readonly int bytesPerPixel;
 		private readonly uint bgra;
 		private readonly byte fillB;
 		private readonly byte fillG;
@@ -20,9 +20,9 @@ internal class PadTransform : PixelSource
 
 		public PadTransform(PixelSource source, Color color, Rectangle innerRect, Rectangle outerRect) : base(source)
 		{
-			Bpp = Format.BitsPerPixel / 8;
+			bytesPerPixel = Format.BitsPerPixel / 8;
 
-			if (Format.NumericRepresentation != PixelNumericRepresentation.UnsignedInteger || Format.ChannelCount != Bpp)
+			if (Format.NumericRepresentation != PixelNumericRepresentation.UnsignedInteger || Format.ChannelCount != bytesPerPixel)
 				throw new NotSupportedException("Pixel format not supported.");
 
 			bgra = (uint)color.ToArgb();
@@ -49,9 +49,9 @@ unsafe protected override void CopyPixelsInternal(WICRect prc, uint cbStride, ui
 
 				if (trect.Width < prc.Width || cy < irect.Y || cy >= irect.Bottom)
 				{
-					if (Bpp == 1)
+					if (bytesPerPixel == 1)
 						new Span<byte>(pb, prc.Width).Fill(fillB);
-					else if (Bpp == 4)
+					else if (bytesPerPixel == 4)
 						new Span<uint>(pb, prc.Width).Fill(bgra);
 					else
 					{
@@ -70,7 +70,7 @@ unsafe protected override void CopyPixelsInternal(WICRect prc, uint cbStride, ui
 				{
 					trect.Y = cy - irect.Y;
 					Timer.Stop();
-					Source.CopyPixels(trect, cbStride, cbBufferSize, (IntPtr)(pb + cx * Bpp));
+					Source.CopyPixels(trect, cbStride, cbBufferSize, (IntPtr)(pb + cx * bytesPerPixel));
 					Timer.Start();
 				}
 			}

src/MagicScaler/Utilities/MiscExtensions.cs

@@ -37,7 +37,7 @@ public static WICBitmapTransformOptions ToWicTransformOptions(this Orientation o
 			return opt;
 		}
 
-		public static bool SwapDimensions(this Orientation o) => o > Orientation.FlipVertical;
+		public static bool RequiresDimensionSwap(this Orientation o) => o > Orientation.FlipVertical;
 
 		public static bool RequiresCache(this Orientation o) => o > Orientation.FlipHorizontal;
 
@@ -67,26 +67,22 @@ public static ArraySegment<T> Zero<T>(this ArraySegment<T> a)
 			return a;
 		}
 
-		public static TValue GetValueOrDefault<TKey, TValue>(this IDictionary<TKey, TValue> dic, TKey key, Func<TValue> valueFactory = null)
-		{
-			return dic.TryGetValue(key, out var value) ? value : valueFactory == null ? default : valueFactory();
-		}
+		public static TValue GetValueOrDefault<TKey, TValue>(this IDictionary<TKey, TValue> dic, TKey key, Func<TValue> valueFactory = null) =>
+			dic.TryGetValue(key, out var value) ? value : valueFactory is null ? default : valueFactory();
 
 #if NETFRAMEWORK
-		public static IDictionary<string, string> ToDictionary(this NameValueCollection nv)
-		{
-			return nv.AllKeys.Where(k => !string.IsNullOrEmpty(k)).ToDictionary(k => k, k => nv.GetValues(k).LastOrDefault(), StringComparer.OrdinalIgnoreCase);
-		}
+		public static IDictionary<string, string> ToDictionary(this NameValueCollection nv) =>
+			nv.AllKeys.Where(k => !string.IsNullOrEmpty(k)).ToDictionary(k => k, k => nv.GetValues(k).LastOrDefault(), StringComparer.OrdinalIgnoreCase);
 
-		public static IDictionary<string, string> ToDictionary(this KeyValueConfigurationCollection kv)
-		{
-			return kv.AllKeys.Where(k => !string.IsNullOrEmpty(k)).ToDictionary(k => k, k => kv[k].Value, StringComparer.OrdinalIgnoreCase);
-		}
+		public static IDictionary<string, string> ToDictionary(this KeyValueConfigurationCollection kv) =>
+			kv.AllKeys.Where(k => !string.IsNullOrEmpty(k)).ToDictionary(k => k, k => kv[k].Value, StringComparer.OrdinalIgnoreCase);
 #endif
 
 		public static IDictionary<TKey, TValue> Coalesce<TKey, TValue>(this IDictionary<TKey, TValue> dic1, IDictionary<TKey, TValue> dic2)
 		{
-			dic2.ToList().ForEach(i => dic1[i.Key] = i.Value);
+			foreach (var kv in dic2)
+				dic1[kv.Key] = kv.Value;
+
 			return dic1;
 		}