From 96feac380952b1d50674c009daedfbbfbaa9c04e Mon Sep 17 00:00:00 2001 From: Jason Nelson Date: Fri, 17 Aug 2018 14:27:19 -0700 Subject: [PATCH] Throw NRE directly in trival contexts (eliminating method call / extra stack entry) --- src/ImageSharp/Formats/Bmp/BmpDecoder.cs | 1 - src/ImageSharp/Formats/Gif/LzwDecoder.cs | 4 +--- src/ImageSharp/ImageFrameCollection.cs | 9 ++------- .../MetaData/Profiles/ICC/DataReader/IccDataReader.cs | 4 ++-- .../ICC/MultiProcessElements/IccClutProcessElement.cs | 3 +-- .../MultiProcessElements/IccCurveSetProcessElement.cs | 3 +-- .../Profiles/ICC/TagDataEntries/IccDataTagDataEntry.cs | 3 +-- .../ICC/TagDataEntries/IccFix16ArrayTagDataEntry.cs | 3 +-- .../IccMultiLocalizedUnicodeTagDataEntry.cs | 3 +-- .../IccProfileSequenceDescTagDataEntry.cs | 3 +-- .../IccProfileSequenceIdentifierTagDataEntry.cs | 3 +-- .../ICC/TagDataEntries/IccScreeningTagDataEntry.cs | 4 +--- .../ICC/TagDataEntries/IccSignatureTagDataEntry.cs | 5 ++--- .../Profiles/ICC/TagDataEntries/IccTextTagDataEntry.cs | 3 +-- .../ICC/TagDataEntries/IccUFix16ArrayTagDataEntry.cs | 3 +-- .../ICC/TagDataEntries/IccUInt16ArrayTagDataEntry.cs | 3 +-- .../ICC/TagDataEntries/IccUInt32ArrayTagDataEntry.cs | 3 +-- .../ICC/TagDataEntries/IccUInt64ArrayTagDataEntry.cs | 3 +-- .../ICC/TagDataEntries/IccUInt8ArrayTagDataEntry.cs | 3 +-- .../ICC/TagDataEntries/IccUcrBgTagDataEntry.cs | 10 +++------- .../ICC/TagDataEntries/IccUnknownTagDataEntry.cs | 3 +-- .../Profiles/ICC/TagDataEntries/IccXyzTagDataEntry.cs | 3 +-- .../Profiles/ICC/Various/IccColorantTableEntry.cs | 4 +--- .../Profiles/ICC/Various/IccLocalizedString.cs | 7 ++----- src/ImageSharp/MetaData/Profiles/ICC/Various/IccLut.cs | 3 +-- .../Binarization/BinaryOrderedDitherProcessor.cs | 4 +--- .../Dithering/OrderedDitherPaletteProcessor.cs | 3 +-- .../Processors/Dithering/PaletteDitherProcessorBase.cs | 4 ++-- 28 files changed, 34 insertions(+), 73 deletions(-) diff --git a/src/ImageSharp/Formats/Bmp/BmpDecoder.cs b/src/ImageSharp/Formats/Bmp/BmpDecoder.cs index d3cb50d6b..3d079cf61 100644 --- a/src/ImageSharp/Formats/Bmp/BmpDecoder.cs +++ b/src/ImageSharp/Formats/Bmp/BmpDecoder.cs @@ -25,7 +25,6 @@ namespace SixLabors.ImageSharp.Formats.Bmp { /// public Image Decode(Configuration configuration, Stream stream) - where TPixel : struct, IPixel { Guard.NotNull(stream, nameof(stream)); diff --git a/src/ImageSharp/Formats/Gif/LzwDecoder.cs b/src/ImageSharp/Formats/Gif/LzwDecoder.cs index 3c7b6a4af..07594e81a 100644 --- a/src/ImageSharp/Formats/Gif/LzwDecoder.cs +++ b/src/ImageSharp/Formats/Gif/LzwDecoder.cs @@ -56,9 +56,7 @@ namespace SixLabors.ImageSharp.Formats.Gif /// is null. public LzwDecoder(MemoryAllocator memoryAllocator, Stream stream) { - Guard.NotNull(stream, nameof(stream)); - - this.stream = stream; + this.stream = stream ?? throw new ArgumentNullException(nameof(stream)); this.prefix = memoryAllocator.Allocate(MaxStackSize, AllocationOptions.Clean); this.suffix = memoryAllocator.Allocate(MaxStackSize, AllocationOptions.Clean); diff --git a/src/ImageSharp/ImageFrameCollection.cs b/src/ImageSharp/ImageFrameCollection.cs index 929dd7e36..59571ce92 100644 --- a/src/ImageSharp/ImageFrameCollection.cs +++ b/src/ImageSharp/ImageFrameCollection.cs @@ -7,7 +7,6 @@ using System.Collections.Generic; using SixLabors.ImageSharp.Advanced; using SixLabors.ImageSharp.Memory; using SixLabors.ImageSharp.PixelFormats; -using SixLabors.Memory; namespace SixLabors.ImageSharp { @@ -23,9 +22,7 @@ namespace SixLabors.ImageSharp internal ImageFrameCollection(Image parent, int width, int height, TPixel backgroundColor) { - Guard.NotNull(parent, nameof(parent)); - - this.parent = parent; + this.parent = parent ?? throw new ArgumentNullException(nameof(parent)); // Frames are already cloned within the caller this.frames.Add(new ImageFrame(parent.GetConfiguration(), width, height, backgroundColor)); @@ -33,9 +30,7 @@ namespace SixLabors.ImageSharp internal ImageFrameCollection(Image parent, int width, int height, MemorySource memorySource) { - Guard.NotNull(parent, nameof(parent)); - - this.parent = parent; + this.parent = parent ?? throw new ArgumentNullException(nameof(parent)); // Frames are already cloned within the caller this.frames.Add(new ImageFrame(parent.GetConfiguration(), width, height, memorySource)); diff --git a/src/ImageSharp/MetaData/Profiles/ICC/DataReader/IccDataReader.cs b/src/ImageSharp/MetaData/Profiles/ICC/DataReader/IccDataReader.cs index 49b453a46..cc0f8f34d 100644 --- a/src/ImageSharp/MetaData/Profiles/ICC/DataReader/IccDataReader.cs +++ b/src/ImageSharp/MetaData/Profiles/ICC/DataReader/IccDataReader.cs @@ -1,6 +1,7 @@ // Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. +using System; using System.Text; namespace SixLabors.ImageSharp.MetaData.Profiles.Icc @@ -28,8 +29,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc /// The data to read public IccDataReader(byte[] data) { - Guard.NotNull(data, nameof(data)); - this.data = data; + this.data = data ?? throw new ArgumentNullException(nameof(data)); } /// diff --git a/src/ImageSharp/MetaData/Profiles/ICC/MultiProcessElements/IccClutProcessElement.cs b/src/ImageSharp/MetaData/Profiles/ICC/MultiProcessElements/IccClutProcessElement.cs index 384ae850f..6aba18632 100644 --- a/src/ImageSharp/MetaData/Profiles/ICC/MultiProcessElements/IccClutProcessElement.cs +++ b/src/ImageSharp/MetaData/Profiles/ICC/MultiProcessElements/IccClutProcessElement.cs @@ -17,8 +17,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc public IccClutProcessElement(IccClut clutValue) : base(IccMultiProcessElementSignature.Clut, clutValue?.InputChannelCount ?? 1, clutValue?.OutputChannelCount ?? 1) { - Guard.NotNull(clutValue, nameof(clutValue)); - this.ClutValue = clutValue; + this.ClutValue = clutValue ?? throw new ArgumentNullException(nameof(clutValue)); } /// diff --git a/src/ImageSharp/MetaData/Profiles/ICC/MultiProcessElements/IccCurveSetProcessElement.cs b/src/ImageSharp/MetaData/Profiles/ICC/MultiProcessElements/IccCurveSetProcessElement.cs index 0aa030684..7585fc212 100644 --- a/src/ImageSharp/MetaData/Profiles/ICC/MultiProcessElements/IccCurveSetProcessElement.cs +++ b/src/ImageSharp/MetaData/Profiles/ICC/MultiProcessElements/IccCurveSetProcessElement.cs @@ -18,8 +18,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc public IccCurveSetProcessElement(IccOneDimensionalCurve[] curves) : base(IccMultiProcessElementSignature.CurveSet, curves?.Length ?? 1, curves?.Length ?? 1) { - Guard.NotNull(curves, nameof(curves)); - this.Curves = curves; + this.Curves = curves ?? throw new ArgumentNullException(nameof(curves)); } /// diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccDataTagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccDataTagDataEntry.cs index e6a6cdff2..9b24bffe8 100644 --- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccDataTagDataEntry.cs +++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccDataTagDataEntry.cs @@ -42,8 +42,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc public IccDataTagDataEntry(byte[] data, bool isAscii, IccProfileTag tagSignature) : base(IccTypeSignature.Data, tagSignature) { - Guard.NotNull(data, nameof(data)); - this.Data = data; + this.Data = data ?? throw new ArgumentException(nameof(data)); this.IsAscii = isAscii; } diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccFix16ArrayTagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccFix16ArrayTagDataEntry.cs index 6f4d03988..a76310927 100644 --- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccFix16ArrayTagDataEntry.cs +++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccFix16ArrayTagDataEntry.cs @@ -27,8 +27,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc public IccFix16ArrayTagDataEntry(float[] data, IccProfileTag tagSignature) : base(IccTypeSignature.S15Fixed16Array, tagSignature) { - Guard.NotNull(data, nameof(data)); - this.Data = data; + this.Data = data ?? throw new ArgumentNullException(nameof(data)); } /// diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccMultiLocalizedUnicodeTagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccMultiLocalizedUnicodeTagDataEntry.cs index 5652fd99e..48ed048bf 100644 --- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccMultiLocalizedUnicodeTagDataEntry.cs +++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccMultiLocalizedUnicodeTagDataEntry.cs @@ -29,8 +29,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc public IccMultiLocalizedUnicodeTagDataEntry(IccLocalizedString[] texts, IccProfileTag tagSignature) : base(IccTypeSignature.MultiLocalizedUnicode, tagSignature) { - Guard.NotNull(texts, nameof(texts)); - this.Texts = texts; + this.Texts = texts ?? throw new ArgumentNullException(nameof(texts)); } /// diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccProfileSequenceDescTagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccProfileSequenceDescTagDataEntry.cs index c42004634..da6fcd7a2 100644 --- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccProfileSequenceDescTagDataEntry.cs +++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccProfileSequenceDescTagDataEntry.cs @@ -30,8 +30,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc public IccProfileSequenceDescTagDataEntry(IccProfileDescription[] descriptions, IccProfileTag tagSignature) : base(IccTypeSignature.ProfileSequenceDesc, tagSignature) { - Guard.NotNull(descriptions, nameof(descriptions)); - this.Descriptions = descriptions; + this.Descriptions = descriptions ?? throw new ArgumentNullException(nameof(descriptions)); } /// diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccProfileSequenceIdentifierTagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccProfileSequenceIdentifierTagDataEntry.cs index 333615524..51528a073 100644 --- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccProfileSequenceIdentifierTagDataEntry.cs +++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccProfileSequenceIdentifierTagDataEntry.cs @@ -28,8 +28,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc public IccProfileSequenceIdentifierTagDataEntry(IccProfileSequenceIdentifier[] data, IccProfileTag tagSignature) : base(IccTypeSignature.ProfileSequenceIdentifier, tagSignature) { - Guard.NotNull(data, nameof(data)); - this.Data = data; + this.Data = data ?? throw new ArgumentNullException(nameof(data)); } /// diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccScreeningTagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccScreeningTagDataEntry.cs index de6264824..0bf8abfca 100644 --- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccScreeningTagDataEntry.cs +++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccScreeningTagDataEntry.cs @@ -30,10 +30,8 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc public IccScreeningTagDataEntry(IccScreeningFlag flags, IccScreeningChannel[] channels, IccProfileTag tagSignature) : base(IccTypeSignature.Screening, tagSignature) { - Guard.NotNull(channels, nameof(channels)); - this.Flags = flags; - this.Channels = channels; + this.Channels = channels ?? throw new ArgumentNullException(nameof(channels)); } /// diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccSignatureTagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccSignatureTagDataEntry.cs index e469e7eab..da557e644 100644 --- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccSignatureTagDataEntry.cs +++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccSignatureTagDataEntry.cs @@ -28,12 +28,11 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc public IccSignatureTagDataEntry(string signatureData, IccProfileTag tagSignature) : base(IccTypeSignature.Signature, tagSignature) { - Guard.NotNull(signatureData, nameof(signatureData)); - this.SignatureData = signatureData; + this.SignatureData = signatureData ?? throw new ArgumentNullException(nameof(signatureData)); } /// - /// Gets the Signature + /// Gets the signature data /// public string SignatureData { get; } diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccTextTagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccTextTagDataEntry.cs index 1cf321893..f10712d96 100644 --- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccTextTagDataEntry.cs +++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccTextTagDataEntry.cs @@ -27,8 +27,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc public IccTextTagDataEntry(string text, IccProfileTag tagSignature) : base(IccTypeSignature.Text, tagSignature) { - Guard.NotNull(text, nameof(text)); - this.Text = text; + this.Text = text ?? throw new ArgumentNullException(nameof(text)); } /// diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUFix16ArrayTagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUFix16ArrayTagDataEntry.cs index 4d9979a4f..19430dc7b 100644 --- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUFix16ArrayTagDataEntry.cs +++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUFix16ArrayTagDataEntry.cs @@ -27,8 +27,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc public IccUFix16ArrayTagDataEntry(float[] data, IccProfileTag tagSignature) : base(IccTypeSignature.U16Fixed16Array, tagSignature) { - Guard.NotNull(data, nameof(data)); - this.Data = data; + this.Data = data ?? throw new ArgumentNullException(nameof(data)); } /// diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUInt16ArrayTagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUInt16ArrayTagDataEntry.cs index b0c225d85..d9c093bda 100644 --- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUInt16ArrayTagDataEntry.cs +++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUInt16ArrayTagDataEntry.cs @@ -27,8 +27,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc public IccUInt16ArrayTagDataEntry(ushort[] data, IccProfileTag tagSignature) : base(IccTypeSignature.UInt16Array, tagSignature) { - Guard.NotNull(data, nameof(data)); - this.Data = data; + this.Data = data ?? throw new ArgumentNullException(nameof(data)); } /// diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUInt32ArrayTagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUInt32ArrayTagDataEntry.cs index 03013d548..803191929 100644 --- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUInt32ArrayTagDataEntry.cs +++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUInt32ArrayTagDataEntry.cs @@ -27,8 +27,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc public IccUInt32ArrayTagDataEntry(uint[] data, IccProfileTag tagSignature) : base(IccTypeSignature.UInt32Array, tagSignature) { - Guard.NotNull(data, nameof(data)); - this.Data = data; + this.Data = data ?? throw new ArgumentNullException(nameof(data)); } /// diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUInt64ArrayTagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUInt64ArrayTagDataEntry.cs index c950ab4f6..2973b9ae6 100644 --- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUInt64ArrayTagDataEntry.cs +++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUInt64ArrayTagDataEntry.cs @@ -28,8 +28,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc public IccUInt64ArrayTagDataEntry(ulong[] data, IccProfileTag tagSignature) : base(IccTypeSignature.UInt64Array, tagSignature) { - Guard.NotNull(data, nameof(data)); - this.Data = data; + this.Data = data ?? throw new ArgumentNullException(nameof(data)); } /// diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUInt8ArrayTagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUInt8ArrayTagDataEntry.cs index 40dbaf3b0..2391ce96a 100644 --- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUInt8ArrayTagDataEntry.cs +++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUInt8ArrayTagDataEntry.cs @@ -27,8 +27,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc public IccUInt8ArrayTagDataEntry(byte[] data, IccProfileTag tagSignature) : base(IccTypeSignature.UInt8Array, tagSignature) { - Guard.NotNull(data, nameof(data)); - this.Data = data; + this.Data = data ?? throw new ArgumentNullException(nameof(data)); } /// diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUcrBgTagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUcrBgTagDataEntry.cs index 94bfcbfd9..eed4f97d4 100644 --- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUcrBgTagDataEntry.cs +++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUcrBgTagDataEntry.cs @@ -32,13 +32,9 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc public IccUcrBgTagDataEntry(ushort[] ucrCurve, ushort[] bgCurve, string description, IccProfileTag tagSignature) : base(IccTypeSignature.UcrBg, tagSignature) { - Guard.NotNull(ucrCurve, nameof(ucrCurve)); - Guard.NotNull(bgCurve, nameof(bgCurve)); - Guard.NotNull(description, nameof(description)); - - this.UcrCurve = ucrCurve; - this.BgCurve = bgCurve; - this.Description = description; + this.UcrCurve = ucrCurve ?? throw new ArgumentNullException(nameof(ucrCurve)); + this.BgCurve = bgCurve ?? throw new ArgumentNullException(nameof(bgCurve)); + this.Description = description ?? throw new ArgumentNullException(nameof(description)); } /// diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUnknownTagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUnknownTagDataEntry.cs index d3153c3b2..da206a968 100644 --- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUnknownTagDataEntry.cs +++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUnknownTagDataEntry.cs @@ -27,8 +27,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc public IccUnknownTagDataEntry(byte[] data, IccProfileTag tagSignature) : base(IccTypeSignature.Unknown, tagSignature) { - Guard.NotNull(data, nameof(data)); - this.Data = data; + this.Data = data ?? throw new ArgumentNullException(nameof(data)); } /// diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccXyzTagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccXyzTagDataEntry.cs index 162392326..c1c14d8cb 100644 --- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccXyzTagDataEntry.cs +++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccXyzTagDataEntry.cs @@ -28,8 +28,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc public IccXyzTagDataEntry(Vector3[] data, IccProfileTag tagSignature) : base(IccTypeSignature.Xyz, tagSignature) { - Guard.NotNull(data, nameof(data)); - this.Data = data; + this.Data = data ?? throw new ArgumentNullException(nameof(data)); } /// diff --git a/src/ImageSharp/MetaData/Profiles/ICC/Various/IccColorantTableEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/Various/IccColorantTableEntry.cs index 22e4a0523..56aa8b335 100644 --- a/src/ImageSharp/MetaData/Profiles/ICC/Various/IccColorantTableEntry.cs +++ b/src/ImageSharp/MetaData/Profiles/ICC/Various/IccColorantTableEntry.cs @@ -28,9 +28,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc /// Third PCS value public IccColorantTableEntry(string name, ushort pcs1, ushort pcs2, ushort pcs3) { - Guard.NotNull(name, nameof(name)); - - this.Name = name; + this.Name = name ?? throw new ArgumentNullException(nameof(name)); this.Pcs1 = pcs1; this.Pcs2 = pcs2; this.Pcs3 = pcs3; diff --git a/src/ImageSharp/MetaData/Profiles/ICC/Various/IccLocalizedString.cs b/src/ImageSharp/MetaData/Profiles/ICC/Various/IccLocalizedString.cs index 18e28e94c..00ededca4 100644 --- a/src/ImageSharp/MetaData/Profiles/ICC/Various/IccLocalizedString.cs +++ b/src/ImageSharp/MetaData/Profiles/ICC/Various/IccLocalizedString.cs @@ -29,11 +29,8 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc /// The text value of this string public IccLocalizedString(CultureInfo culture, string text) { - Guard.NotNull(culture, nameof(culture)); - Guard.NotNull(text, nameof(text)); - - this.Culture = culture; - this.Text = text; + this.Culture = culture ?? throw new ArgumentNullException(nameof(culture)); + this.Text = text ?? throw new ArgumentNullException(nameof(text)); } /// diff --git a/src/ImageSharp/MetaData/Profiles/ICC/Various/IccLut.cs b/src/ImageSharp/MetaData/Profiles/ICC/Various/IccLut.cs index a84631143..c46d6884b 100644 --- a/src/ImageSharp/MetaData/Profiles/ICC/Various/IccLut.cs +++ b/src/ImageSharp/MetaData/Profiles/ICC/Various/IccLut.cs @@ -16,8 +16,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc /// The LUT values public IccLut(float[] values) { - Guard.NotNull(values, nameof(values)); - this.Values = values; + this.Values = values ?? throw new ArgumentNullException(nameof(values)); } /// diff --git a/src/ImageSharp/Processing/Processors/Binarization/BinaryOrderedDitherProcessor.cs b/src/ImageSharp/Processing/Processors/Binarization/BinaryOrderedDitherProcessor.cs index 95f4ef472..048af8261 100644 --- a/src/ImageSharp/Processing/Processors/Binarization/BinaryOrderedDitherProcessor.cs +++ b/src/ImageSharp/Processing/Processors/Binarization/BinaryOrderedDitherProcessor.cs @@ -33,9 +33,7 @@ namespace SixLabors.ImageSharp.Processing.Processors.Binarization /// The color to use for pixels that are below the threshold. public BinaryOrderedDitherProcessor(IOrderedDither dither, TPixel upperColor, TPixel lowerColor) { - Guard.NotNull(dither, nameof(dither)); - - this.Dither = dither; + this.Dither = dither ?? throw new ArgumentNullException(nameof(dither)); this.UpperColor = upperColor; this.LowerColor = lowerColor; } diff --git a/src/ImageSharp/Processing/Processors/Dithering/OrderedDitherPaletteProcessor.cs b/src/ImageSharp/Processing/Processors/Dithering/OrderedDitherPaletteProcessor.cs index 4100fef8c..b5e2eebc2 100644 --- a/src/ImageSharp/Processing/Processors/Dithering/OrderedDitherPaletteProcessor.cs +++ b/src/ImageSharp/Processing/Processors/Dithering/OrderedDitherPaletteProcessor.cs @@ -34,8 +34,7 @@ namespace SixLabors.ImageSharp.Processing.Processors.Dithering public OrderedDitherPaletteProcessor(IOrderedDither dither, TPixel[] palette) : base(palette) { - Guard.NotNull(dither, nameof(dither)); - this.Dither = dither; + this.Dither = dither ?? throw new ArgumentNullException(nameof(dither)); } /// diff --git a/src/ImageSharp/Processing/Processors/Dithering/PaletteDitherProcessorBase.cs b/src/ImageSharp/Processing/Processors/Dithering/PaletteDitherProcessorBase.cs index e70c8acd2..a1bbe7273 100644 --- a/src/ImageSharp/Processing/Processors/Dithering/PaletteDitherProcessorBase.cs +++ b/src/ImageSharp/Processing/Processors/Dithering/PaletteDitherProcessorBase.cs @@ -1,6 +1,7 @@ // Copyright (c) Six Labors and contributors. // Licensed under the Apache License, Version 2.0. +using System; using System.Collections.Generic; using System.Numerics; using System.Runtime.CompilerServices; @@ -28,8 +29,7 @@ namespace SixLabors.ImageSharp.Processing.Processors.Dithering /// The palette to select substitute colors from. protected PaletteDitherProcessorBase(TPixel[] palette) { - Guard.NotNull(palette, nameof(palette)); - this.Palette = palette; + this.Palette = palette ?? throw new ArgumentNullException(nameof(palette)); this.paletteVector = new Vector4[this.Palette.Length]; PixelOperations.Instance.ToScaledVector4(this.Palette, this.paletteVector, this.Palette.Length); }