tsai
/
ImageSharp
mirror of https://github.com/SixLabors/ImageSharp
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Add missing usings

pull/1635/head
Brian Popow 5 years ago
parent
b49313e1dc
commit
86adfa588d
16 changed files with 167 additions and 158 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs
  2. 82
      tests/ImageSharp.Tests/Image/ImageFrameCollectionTests.Generic.cs
  3. 15
      tests/ImageSharp.Tests/Image/ImageTests.Save.cs
  4. 16
      tests/ImageSharp.Tests/Image/ImageTests.SaveAsync.cs
  5. 14
      tests/ImageSharp.Tests/Metadata/Profiles/ICC/DataWriter/IccDataWriterCurvesTests.cs
  6. 14
      tests/ImageSharp.Tests/Metadata/Profiles/ICC/DataWriter/IccDataWriterLutTests.cs
  7. 14
      tests/ImageSharp.Tests/Metadata/Profiles/ICC/DataWriter/IccDataWriterLutTests1.cs
  8. 14
      tests/ImageSharp.Tests/Metadata/Profiles/ICC/DataWriter/IccDataWriterLutTests2.cs
  9. 12
      tests/ImageSharp.Tests/Metadata/Profiles/ICC/DataWriter/IccDataWriterMatrixTests.cs
  10. 10
      tests/ImageSharp.Tests/Metadata/Profiles/ICC/DataWriter/IccDataWriterMultiProcessElementTests.cs
  11. 20
      tests/ImageSharp.Tests/Metadata/Profiles/ICC/DataWriter/IccDataWriterNonPrimitivesTests.cs
  12. 20
      tests/ImageSharp.Tests/Metadata/Profiles/ICC/DataWriter/IccDataWriterPrimitivesTests.cs
  13. 68
      tests/ImageSharp.Tests/Metadata/Profiles/ICC/DataWriter/IccDataWriterTagDataEntryTests.cs
  14. 18
      tests/ImageSharp.Tests/Metadata/Profiles/ICC/DataWriter/IccDataWriterTests.cs
  15. 3
      tests/ImageSharp.Tests/TestUtilities/ImageProviders/TestPatternProvider.cs
  16. 3
      tests/ImageSharp.Tests/TestUtilities/TestUtils.cs

2
tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs
View File

@ -117,7 +117,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
[Theory] [Theory]
[WithFile(TestImages.Jpeg.Baseline.Floorplan, PixelTypes.Rgba32)] [WithFile(TestImages.Jpeg.Baseline.Floorplan, PixelTypes.Rgba32)]
[WithFile(TestImages.Jpeg.Progressive.Festzug, PixelTypes.Rgba32)] [WithFile(TestImages.Jpeg.Progressive.Festzug, PixelTypes.Rgba32)]
public async Task DecodeAsnc_DegenerateMemoryRequest_ShouldTranslateTo_ImageFormatException<TPixel>(TestImageProvider<TPixel> provider) public async Task DecodeAsync_DegenerateMemoryRequest_ShouldTranslateTo_ImageFormatException<TPixel>(TestImageProvider<TPixel> provider)
where TPixel : unmanaged, IPixel<TPixel> where TPixel : unmanaged, IPixel<TPixel>
{ {
provider.LimitAllocatorBufferCapacity().InBytesSqrt(10); provider.LimitAllocatorBufferCapacity().InBytesSqrt(10);

82
tests/ImageSharp.Tests/Image/ImageFrameCollectionTests.Generic.cs
View File

@ -28,7 +28,8 @@ namespace SixLabors.ImageSharp.Tests
ArgumentException ex = Assert.Throws<ArgumentException>( ArgumentException ex = Assert.Throws<ArgumentException>(
() => () =>
{ {
this.Collection.AddFrame(new ImageFrame<Rgba32>(Configuration.Default, 1, 1)); using var frame = new ImageFrame<Rgba32>(Configuration.Default, 1, 1);
using ImageFrame<Rgba32> addedFrame = this.Collection.AddFrame(frame);
}); });
Assert.StartsWith("Frame must have the same dimensions as the image.", ex.Message); Assert.StartsWith("Frame must have the same dimensions as the image.", ex.Message);
@ -40,7 +41,7 @@ namespace SixLabors.ImageSharp.Tests
ArgumentNullException ex = Assert.Throws<ArgumentNullException>( ArgumentNullException ex = Assert.Throws<ArgumentNullException>(
() => () =>
{ {
this.Collection.AddFrame((ImageFrame<Rgba32>)null); using ImageFrame<Rgba32> addedFrame = this.Collection.AddFrame((ImageFrame<Rgba32>)null);
}); });
Assert.StartsWith("Parameter \"frame\" must be not null.", ex.Message); Assert.StartsWith("Parameter \"frame\" must be not null.", ex.Message);
@ -54,7 +55,7 @@ namespace SixLabors.ImageSharp.Tests
ArgumentNullException ex = Assert.Throws<ArgumentNullException>( ArgumentNullException ex = Assert.Throws<ArgumentNullException>(
() => () =>
{ {
this.Collection.AddFrame(data); using ImageFrame<Rgba32> addedFrame = this.Collection.AddFrame(data);
}); });
Assert.StartsWith("Parameter \"source\" must be not null.", ex.Message); Assert.StartsWith("Parameter \"source\" must be not null.", ex.Message);
@ -66,7 +67,7 @@ namespace SixLabors.ImageSharp.Tests
ArgumentOutOfRangeException ex = Assert.Throws<ArgumentOutOfRangeException>( ArgumentOutOfRangeException ex = Assert.Throws<ArgumentOutOfRangeException>(
() => () =>
{ {
this.Collection.AddFrame(Array.Empty<Rgba32>()); using ImageFrame<Rgba32> addedFrame = this.Collection.AddFrame(Array.Empty<Rgba32>());
}); });
Assert.StartsWith($"Parameter \"data\" ({typeof(int)}) must be greater than or equal to {100}, was {0}", ex.Message); Assert.StartsWith($"Parameter \"data\" ({typeof(int)}) must be greater than or equal to {100}, was {0}", ex.Message);
@ -78,7 +79,8 @@ namespace SixLabors.ImageSharp.Tests
ArgumentException ex = Assert.Throws<ArgumentException>( ArgumentException ex = Assert.Throws<ArgumentException>(
() => () =>
{ {
this.Collection.InsertFrame(1, new ImageFrame<Rgba32>(Configuration.Default, 1, 1)); using var frame = new ImageFrame<Rgba32>(Configuration.Default, 1, 1);
using ImageFrame<Rgba32> insertedFrame = this.Collection.InsertFrame(1, frame);
}); });
Assert.StartsWith("Frame must have the same dimensions as the image.", ex.Message); Assert.StartsWith("Frame must have the same dimensions as the image.", ex.Message);
@ -90,7 +92,7 @@ namespace SixLabors.ImageSharp.Tests
ArgumentNullException ex = Assert.Throws<ArgumentNullException>( ArgumentNullException ex = Assert.Throws<ArgumentNullException>(
() => () =>
{ {
this.Collection.InsertFrame(1, null); using ImageFrame<Rgba32> insertedFrame = this.Collection.InsertFrame(1, null);
}); });
Assert.StartsWith("Parameter \"frame\" must be not null.", ex.Message); Assert.StartsWith("Parameter \"frame\" must be not null.", ex.Message);
@ -102,9 +104,11 @@ namespace SixLabors.ImageSharp.Tests
ArgumentException ex = Assert.Throws<ArgumentException>( ArgumentException ex = Assert.Throws<ArgumentException>(
() => () =>
{ {
using var imageFrame1 = new ImageFrame<Rgba32>(Configuration.Default, 10, 10);
using var imageFrame2 = new ImageFrame<Rgba32>(Configuration.Default, 1, 1);
new ImageFrameCollection<Rgba32>( new ImageFrameCollection<Rgba32>(
this.Image, this.Image,
new[] { new ImageFrame<Rgba32>(Configuration.Default, 10, 10), new ImageFrame<Rgba32>(Configuration.Default, 1, 1) }); new[] { imageFrame1, imageFrame2 });
}); });
Assert.StartsWith("Frame must have the same dimensions as the image.", ex.Message); Assert.StartsWith("Frame must have the same dimensions as the image.", ex.Message);
@ -113,24 +117,24 @@ namespace SixLabors.ImageSharp.Tests
[Fact] [Fact]
public void RemoveAtFrame_ThrowIfRemovingLastFrame() public void RemoveAtFrame_ThrowIfRemovingLastFrame()
{ {
using var imageFrame = new ImageFrame<Rgba32>(Configuration.Default, 10, 10);
var collection = new ImageFrameCollection<Rgba32>( var collection = new ImageFrameCollection<Rgba32>(
this.Image, this.Image,
new[] { new ImageFrame<Rgba32>(Configuration.Default, 10, 10) }); new[] { imageFrame });
InvalidOperationException ex = Assert.Throws<InvalidOperationException>( InvalidOperationException ex = Assert.Throws<InvalidOperationException>(
() => () => collection.RemoveFrame(0));
{
collection.RemoveFrame(0);
});
Assert.Equal("Cannot remove last frame.", ex.Message); Assert.Equal("Cannot remove last frame.", ex.Message);
} }
[Fact] [Fact]
public void RemoveAtFrame_CanRemoveFrameZeroIfMultipleFramesExist() public void RemoveAtFrame_CanRemoveFrameZeroIfMultipleFramesExist()
{ {
using var imageFrame1 = new ImageFrame<Rgba32>(Configuration.Default, 10, 10);
using var imageFrame2 = new ImageFrame<Rgba32>(Configuration.Default, 10, 10);
var collection = new ImageFrameCollection<Rgba32>( var collection = new ImageFrameCollection<Rgba32>(
this.Image, this.Image,
new[] { new ImageFrame<Rgba32>(Configuration.Default, 10, 10), new ImageFrame<Rgba32>(Configuration.Default, 10, 10) }); new[] { imageFrame1, imageFrame2 });
collection.RemoveFrame(0); collection.RemoveFrame(0);
Assert.Equal(1, collection.Count); Assert.Equal(1, collection.Count);
@ -139,9 +143,11 @@ namespace SixLabors.ImageSharp.Tests
[Fact] [Fact]
public void RootFrameIsFrameAtIndexZero() public void RootFrameIsFrameAtIndexZero()
{ {
using var imageFrame1 = new ImageFrame<Rgba32>(Configuration.Default, 10, 10);
using var imageFrame2 = new ImageFrame<Rgba32>(Configuration.Default, 10, 10);
var collection = new ImageFrameCollection<Rgba32>( var collection = new ImageFrameCollection<Rgba32>(
this.Image, this.Image,
new[] { new ImageFrame<Rgba32>(Configuration.Default, 10, 10), new ImageFrame<Rgba32>(Configuration.Default, 10, 10) }); new[] { imageFrame1, imageFrame2 });
Assert.Equal(collection.RootFrame, collection[0]); Assert.Equal(collection.RootFrame, collection[0]);
} }
@ -149,9 +155,11 @@ namespace SixLabors.ImageSharp.Tests
[Fact] [Fact]
public void ConstructorPopulatesFrames() public void ConstructorPopulatesFrames()
{ {
using var imageFrame1 = new ImageFrame<Rgba32>(Configuration.Default, 10, 10);
using var imageFrame2 = new ImageFrame<Rgba32>(Configuration.Default, 10, 10);
var collection = new ImageFrameCollection<Rgba32>( var collection = new ImageFrameCollection<Rgba32>(
this.Image, this.Image,
new[] { new ImageFrame<Rgba32>(Configuration.Default, 10, 10), new ImageFrame<Rgba32>(Configuration.Default, 10, 10) }); new[] { imageFrame1, imageFrame2 });
Assert.Equal(2, collection.Count); Assert.Equal(2, collection.Count);
} }
@ -159,9 +167,11 @@ namespace SixLabors.ImageSharp.Tests
[Fact] [Fact]
public void DisposeClearsCollection() public void DisposeClearsCollection()
{ {
using var imageFrame1 = new ImageFrame<Rgba32>(Configuration.Default, 10, 10);
using var imageFrame2 = new ImageFrame<Rgba32>(Configuration.Default, 10, 10);
var collection = new ImageFrameCollection<Rgba32>( var collection = new ImageFrameCollection<Rgba32>(
this.Image, this.Image,
new[] { new ImageFrame<Rgba32>(Configuration.Default, 10, 10), new ImageFrame<Rgba32>(Configuration.Default, 10, 10) }); new[] { imageFrame1, imageFrame2 });
collection.Dispose(); collection.Dispose();
@ -171,9 +181,11 @@ namespace SixLabors.ImageSharp.Tests
[Fact] [Fact]
public void Dispose_DisposesAllInnerFrames() public void Dispose_DisposesAllInnerFrames()
{ {
using var imageFrame1 = new ImageFrame<Rgba32>(Configuration.Default, 10, 10);
using var imageFrame2 = new ImageFrame<Rgba32>(Configuration.Default, 10, 10);
var collection = new ImageFrameCollection<Rgba32>( var collection = new ImageFrameCollection<Rgba32>(
this.Image, this.Image,
new[] { new ImageFrame<Rgba32>(Configuration.Default, 10, 10), new ImageFrame<Rgba32>(Configuration.Default, 10, 10) }); new[] { imageFrame1, imageFrame2 });
IPixelSource<Rgba32>[] framesSnapShot = collection.OfType<IPixelSource<Rgba32>>().ToArray(); IPixelSource<Rgba32>[] framesSnapShot = collection.OfType<IPixelSource<Rgba32>>().ToArray();
collection.Dispose(); collection.Dispose();
@ -194,7 +206,8 @@ namespace SixLabors.ImageSharp.Tests
{ {
using (Image<TPixel> img = provider.GetImage()) using (Image<TPixel> img = provider.GetImage())
{ {
img.Frames.AddFrame(new ImageFrame<TPixel>(Configuration.Default, 10, 10)); // add a frame anyway using var imageFrame = new ImageFrame<Rgba32>(Configuration.Default, 10, 10);
using ImageFrame addedFrame = img.Frames.AddFrame(imageFrame); // add a frame anyway
using (Image<TPixel> cloned = img.Frames.CloneFrame(0)) using (Image<TPixel> cloned = img.Frames.CloneFrame(0))
{ {
Assert.Equal(2, img.Frames.Count); Assert.Equal(2, img.Frames.Count);
@ -215,7 +228,8 @@ namespace SixLabors.ImageSharp.Tests
Assert.True(img.TryGetSinglePixelSpan(out Span<TPixel> imgSpan)); Assert.True(img.TryGetSinglePixelSpan(out Span<TPixel> imgSpan));
TPixel[] sourcePixelData = imgSpan.ToArray(); TPixel[] sourcePixelData = imgSpan.ToArray();
img.Frames.AddFrame(new ImageFrame<TPixel>(Configuration.Default, 10, 10)); using var imageFrame = new ImageFrame<Rgba32>(Configuration.Default, 10, 10);
using ImageFrame addedFrame = img.Frames.AddFrame(imageFrame);
using (Image<TPixel> cloned = img.Frames.ExportFrame(0)) using (Image<TPixel> cloned = img.Frames.ExportFrame(0))
{ {
Assert.Equal(1, img.Frames.Count); Assert.Equal(1, img.Frames.Count);
@ -227,19 +241,21 @@ namespace SixLabors.ImageSharp.Tests
[Fact] [Fact]
public void CreateFrame_Default() public void CreateFrame_Default()
{ {
this.Image.Frames.CreateFrame(); using (this.Image.Frames.CreateFrame())
{
Assert.Equal(2, this.Image.Frames.Count); Assert.Equal(2, this.Image.Frames.Count);
this.Image.Frames[1].ComparePixelBufferTo(default(Rgba32)); this.Image.Frames[1].ComparePixelBufferTo(default(Rgba32));
}
} }
[Fact] [Fact]
public void CreateFrame_CustomFillColor() public void CreateFrame_CustomFillColor()
{ {
this.Image.Frames.CreateFrame(Color.HotPink); using (this.Image.Frames.CreateFrame(Color.HotPink))
{
Assert.Equal(2, this.Image.Frames.Count); Assert.Equal(2, this.Image.Frames.Count);
this.Image.Frames[1].ComparePixelBufferTo(Color.HotPink); this.Image.Frames[1].ComparePixelBufferTo(Color.HotPink);
}
} }
[Fact] [Fact]
@ -247,15 +263,15 @@ namespace SixLabors.ImageSharp.Tests
{ {
Assert.True(this.Image.Frames.RootFrame.TryGetSinglePixelSpan(out Span<Rgba32> imgSpan)); Assert.True(this.Image.Frames.RootFrame.TryGetSinglePixelSpan(out Span<Rgba32> imgSpan));
Rgba32[] pixelData = imgSpan.ToArray(); Rgba32[] pixelData = imgSpan.ToArray();
this.Image.Frames.AddFrame(pixelData); using ImageFrame<Rgba32> addedFrame = this.Image.Frames.AddFrame(pixelData);
Assert.Equal(2, this.Image.Frames.Count); Assert.Equal(2, this.Image.Frames.Count);
} }
[Fact] [Fact]
public void AddFrame_clones_sourceFrame() public void AddFrame_clones_sourceFrame()
{ {
var otherFrame = new ImageFrame<Rgba32>(Configuration.Default, 10, 10); using var otherFrame = new ImageFrame<Rgba32>(Configuration.Default, 10, 10);
ImageFrame<Rgba32> addedFrame = this.Image.Frames.AddFrame(otherFrame); using ImageFrame<Rgba32> addedFrame = this.Image.Frames.AddFrame(otherFrame);
Assert.True(otherFrame.TryGetSinglePixelSpan(out Span<Rgba32> otherFrameSpan)); Assert.True(otherFrame.TryGetSinglePixelSpan(out Span<Rgba32> otherFrameSpan));
addedFrame.ComparePixelBufferTo(otherFrameSpan); addedFrame.ComparePixelBufferTo(otherFrameSpan);
@ -265,8 +281,8 @@ namespace SixLabors.ImageSharp.Tests
[Fact] [Fact]
public void InsertFrame_clones_sourceFrame() public void InsertFrame_clones_sourceFrame()
{ {
var otherFrame = new ImageFrame<Rgba32>(Configuration.Default, 10, 10); using var otherFrame = new ImageFrame<Rgba32>(Configuration.Default, 10, 10);
ImageFrame<Rgba32> addedFrame = this.Image.Frames.InsertFrame(0, otherFrame); using ImageFrame<Rgba32> addedFrame = this.Image.Frames.InsertFrame(0, otherFrame);
Assert.True(otherFrame.TryGetSinglePixelSpan(out Span<Rgba32> otherFrameSpan)); Assert.True(otherFrame.TryGetSinglePixelSpan(out Span<Rgba32> otherFrameSpan));
addedFrame.ComparePixelBufferTo(otherFrameSpan); addedFrame.ComparePixelBufferTo(otherFrameSpan);
@ -320,7 +336,7 @@ namespace SixLabors.ImageSharp.Tests
this.Image.Frames.CreateFrame(); this.Image.Frames.CreateFrame();
} }
var frame = new ImageFrame<Rgba32>(Configuration.Default, 10, 10); using var frame = new ImageFrame<Rgba32>(Configuration.Default, 10, 10);
Assert.False(this.Image.Frames.Contains(frame)); Assert.False(this.Image.Frames.Contains(frame));
} }
} }

15
tests/ImageSharp.Tests/Image/ImageTests.Save.cs
View File

@ -3,9 +3,8 @@
using System; using System;
using System.IO; using System.IO;
using Moq; using Moq;
using SixLabors.ImageSharp.Formats;
using SixLabors.ImageSharp.Formats.Png; using SixLabors.ImageSharp.Formats.Png;
using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.PixelFormats;
using Xunit; using Xunit;
@ -13,8 +12,6 @@ using Xunit;
// ReSharper disable InconsistentNaming // ReSharper disable InconsistentNaming
namespace SixLabors.ImageSharp.Tests namespace SixLabors.ImageSharp.Tests
{ {
using SixLabors.ImageSharp.Formats;
public partial class ImageTests public partial class ImageTests
{ {
public class Save public class Save
@ -23,7 +20,7 @@ namespace SixLabors.ImageSharp.Tests
public void DetectedEncoding() public void DetectedEncoding()
{ {
string dir = TestEnvironment.CreateOutputDirectory(nameof(ImageTests)); string dir = TestEnvironment.CreateOutputDirectory(nameof(ImageTests));
string file = System.IO.Path.Combine(dir, "DetectedEncoding.png"); string file = Path.Combine(dir, "DetectedEncoding.png");
using (var image = new Image<Rgba32>(10, 10)) using (var image = new Image<Rgba32>(10, 10))
{ {
@ -40,7 +37,7 @@ namespace SixLabors.ImageSharp.Tests
public void WhenExtensionIsUnknown_Throws() public void WhenExtensionIsUnknown_Throws()
{ {
string dir = TestEnvironment.CreateOutputDirectory(nameof(ImageTests)); string dir = TestEnvironment.CreateOutputDirectory(nameof(ImageTests));
string file = System.IO.Path.Combine(dir, "UnknownExtensionsEncoding_Throws.tmp"); string file = Path.Combine(dir, "UnknownExtensionsEncoding_Throws.tmp");
Assert.Throws<NotSupportedException>( Assert.Throws<NotSupportedException>(
() => () =>
@ -56,14 +53,14 @@ namespace SixLabors.ImageSharp.Tests
public void SetEncoding() public void SetEncoding()
{ {
string dir = TestEnvironment.CreateOutputDirectory(nameof(ImageTests)); string dir = TestEnvironment.CreateOutputDirectory(nameof(ImageTests));
string file = System.IO.Path.Combine(dir, "SetEncoding.dat"); string file = Path.Combine(dir, "SetEncoding.dat");
using (var image = new Image<Rgba32>(10, 10)) using (var image = new Image<Rgba32>(10, 10))
{ {
image.Save(file, new PngEncoder()); image.Save(file, new PngEncoder());
} }
using (Image.Load(file, out var mime)) using (Image.Load(file, out IImageFormat mime))
{ {
Assert.Equal("image/png", mime.DefaultMimeType); Assert.Equal("image/png", mime.DefaultMimeType);
} }
@ -72,7 +69,7 @@ namespace SixLabors.ImageSharp.Tests
[Fact] [Fact]
public void ThrowsWhenDisposed() public void ThrowsWhenDisposed()
{ {
var image = new Image<Rgba32>(5, 5); using var image = new Image<Rgba32>(5, 5);
image.Dispose(); image.Dispose();
IImageEncoder encoder = Mock.Of<IImageEncoder>(); IImageEncoder encoder = Mock.Of<IImageEncoder>();
using (var stream = new MemoryStream()) using (var stream = new MemoryStream())

16
tests/ImageSharp.Tests/Image/ImageTests.SaveAsync.cs
View File

@ -4,20 +4,18 @@
using System; using System;
using System.IO; using System.IO;
using System.Threading; using System.Threading;
using System.Threading.Tasks;
using Moq; using Moq;
using SixLabors.ImageSharp.Formats.Bmp; using SixLabors.ImageSharp.Advanced;
using SixLabors.ImageSharp.Formats;
using SixLabors.ImageSharp.Formats.Png; using SixLabors.ImageSharp.Formats.Png;
using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.PixelFormats;
using SixLabors.ImageSharp.Tests.TestUtilities;
using Xunit; using Xunit;
// ReSharper disable InconsistentNaming // ReSharper disable InconsistentNaming
namespace SixLabors.ImageSharp.Tests namespace SixLabors.ImageSharp.Tests
{ {
using System.Threading.Tasks;
using SixLabors.ImageSharp.Advanced;
using SixLabors.ImageSharp.Formats;
using SixLabors.ImageSharp.Tests.TestUtilities;
public partial class ImageTests public partial class ImageTests
{ {
public class SaveAsync public class SaveAsync
@ -43,7 +41,7 @@ namespace SixLabors.ImageSharp.Tests
public async Task WhenExtensionIsUnknown_Throws() public async Task WhenExtensionIsUnknown_Throws()
{ {
string dir = TestEnvironment.CreateOutputDirectory(nameof(ImageTests)); string dir = TestEnvironment.CreateOutputDirectory(nameof(ImageTests));
string file = System.IO.Path.Combine(dir, "UnknownExtensionsEncoding_Throws.tmp"); string file = Path.Combine(dir, "UnknownExtensionsEncoding_Throws.tmp");
await Assert.ThrowsAsync<NotSupportedException>( await Assert.ThrowsAsync<NotSupportedException>(
async () => async () =>
@ -59,14 +57,14 @@ namespace SixLabors.ImageSharp.Tests
public async Task SetEncoding() public async Task SetEncoding()
{ {
string dir = TestEnvironment.CreateOutputDirectory(nameof(ImageTests)); string dir = TestEnvironment.CreateOutputDirectory(nameof(ImageTests));
string file = System.IO.Path.Combine(dir, "SetEncoding.dat"); string file = Path.Combine(dir, "SetEncoding.dat");
using (var image = new Image<Rgba32>(10, 10)) using (var image = new Image<Rgba32>(10, 10))
{ {
await image.SaveAsync(file, new PngEncoder()); await image.SaveAsync(file, new PngEncoder());
} }
using (Image.Load(file, out var mime)) using (Image.Load(file, out IImageFormat mime))
{ {
Assert.Equal("image/png", mime.DefaultMimeType); Assert.Equal("image/png", mime.DefaultMimeType);
} }

14
tests/ImageSharp.Tests/Metadata/Profiles/ICC/DataWriter/IccDataWriterCurvesTests.cs
View File

@ -13,7 +13,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataCurves.OneDimensionalCurveTestData), MemberType = typeof(IccTestDataCurves))] [MemberData(nameof(IccTestDataCurves.OneDimensionalCurveTestData), MemberType = typeof(IccTestDataCurves))]
internal void WriteOneDimensionalCurve(byte[] expected, IccOneDimensionalCurve data) internal void WriteOneDimensionalCurve(byte[] expected, IccOneDimensionalCurve data)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteOneDimensionalCurve(data); writer.WriteOneDimensionalCurve(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -25,7 +25,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataCurves.ResponseCurveTestData), MemberType = typeof(IccTestDataCurves))] [MemberData(nameof(IccTestDataCurves.ResponseCurveTestData), MemberType = typeof(IccTestDataCurves))]
internal void WriteResponseCurve(byte[] expected, IccResponseCurve data, int channelCount) internal void WriteResponseCurve(byte[] expected, IccResponseCurve data, int channelCount)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteResponseCurve(data); writer.WriteResponseCurve(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -37,7 +37,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataCurves.ParametricCurveTestData), MemberType = typeof(IccTestDataCurves))] [MemberData(nameof(IccTestDataCurves.ParametricCurveTestData), MemberType = typeof(IccTestDataCurves))]
internal void WriteParametricCurve(byte[] expected, IccParametricCurve data) internal void WriteParametricCurve(byte[] expected, IccParametricCurve data)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteParametricCurve(data); writer.WriteParametricCurve(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -49,7 +49,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataCurves.CurveSegmentTestData), MemberType = typeof(IccTestDataCurves))] [MemberData(nameof(IccTestDataCurves.CurveSegmentTestData), MemberType = typeof(IccTestDataCurves))]
internal void WriteCurveSegment(byte[] expected, IccCurveSegment data) internal void WriteCurveSegment(byte[] expected, IccCurveSegment data)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteCurveSegment(data); writer.WriteCurveSegment(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -61,7 +61,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataCurves.FormulaCurveSegmentTestData), MemberType = typeof(IccTestDataCurves))] [MemberData(nameof(IccTestDataCurves.FormulaCurveSegmentTestData), MemberType = typeof(IccTestDataCurves))]
internal void WriteFormulaCurveElement(byte[] expected, IccFormulaCurveElement data) internal void WriteFormulaCurveElement(byte[] expected, IccFormulaCurveElement data)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteFormulaCurveElement(data); writer.WriteFormulaCurveElement(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -73,7 +73,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataCurves.SampledCurveSegmentTestData), MemberType = typeof(IccTestDataCurves))] [MemberData(nameof(IccTestDataCurves.SampledCurveSegmentTestData), MemberType = typeof(IccTestDataCurves))]
internal void WriteSampledCurveElement(byte[] expected, IccSampledCurveElement data) internal void WriteSampledCurveElement(byte[] expected, IccSampledCurveElement data)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteSampledCurveElement(data); writer.WriteSampledCurveElement(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -81,7 +81,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
Assert.Equal(expected, output); Assert.Equal(expected, output);
} }
private IccDataWriter CreateWriter() private static IccDataWriter CreateWriter()
{ {
return new IccDataWriter(); return new IccDataWriter();
} }

14
tests/ImageSharp.Tests/Metadata/Profiles/ICC/DataWriter/IccDataWriterLutTests.cs
View File

@ -13,7 +13,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataLut.ClutTestData), MemberType = typeof(IccTestDataLut))] [MemberData(nameof(IccTestDataLut.ClutTestData), MemberType = typeof(IccTestDataLut))]
internal void WriteClutAll(byte[] expected, IccClut data, int inChannelCount, int outChannelCount, bool isFloat) internal void WriteClutAll(byte[] expected, IccClut data, int inChannelCount, int outChannelCount, bool isFloat)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteClut(data); writer.WriteClut(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -25,7 +25,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataLut.Clut8TestData), MemberType = typeof(IccTestDataLut))] [MemberData(nameof(IccTestDataLut.Clut8TestData), MemberType = typeof(IccTestDataLut))]
internal void WriteClut8(byte[] expected, IccClut data, int inChannelCount, int outChannelCount, byte[] gridPointCount) internal void WriteClut8(byte[] expected, IccClut data, int inChannelCount, int outChannelCount, byte[] gridPointCount)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteClut8(data); writer.WriteClut8(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -37,7 +37,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataLut.Clut16TestData), MemberType = typeof(IccTestDataLut))] [MemberData(nameof(IccTestDataLut.Clut16TestData), MemberType = typeof(IccTestDataLut))]
internal void WriteClut16(byte[] expected, IccClut data, int inChannelCount, int outChannelCount, byte[] gridPointCount) internal void WriteClut16(byte[] expected, IccClut data, int inChannelCount, int outChannelCount, byte[] gridPointCount)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteClut16(data); writer.WriteClut16(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -49,7 +49,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataLut.ClutF32TestData), MemberType = typeof(IccTestDataLut))] [MemberData(nameof(IccTestDataLut.ClutF32TestData), MemberType = typeof(IccTestDataLut))]
internal void WriteClutF32(byte[] expected, IccClut data, int inChannelCount, int outChannelCount, byte[] gridPointCount) internal void WriteClutF32(byte[] expected, IccClut data, int inChannelCount, int outChannelCount, byte[] gridPointCount)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteClutF32(data); writer.WriteClutF32(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -61,7 +61,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataLut.Lut8TestData), MemberType = typeof(IccTestDataLut))] [MemberData(nameof(IccTestDataLut.Lut8TestData), MemberType = typeof(IccTestDataLut))]
internal void WriteLut8(byte[] expected, IccLut data) internal void WriteLut8(byte[] expected, IccLut data)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteLut8(data); writer.WriteLut8(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -73,7 +73,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataLut.Lut16TestData), MemberType = typeof(IccTestDataLut))] [MemberData(nameof(IccTestDataLut.Lut16TestData), MemberType = typeof(IccTestDataLut))]
internal void WriteLut16(byte[] expected, IccLut data, int count) internal void WriteLut16(byte[] expected, IccLut data, int count)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteLut16(data); writer.WriteLut16(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -81,7 +81,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
Assert.Equal(expected, output); Assert.Equal(expected, output);
} }
private IccDataWriter CreateWriter() private static IccDataWriter CreateWriter()
{ {
return new IccDataWriter(); return new IccDataWriter();
} }

14
tests/ImageSharp.Tests/Metadata/Profiles/ICC/DataWriter/IccDataWriterLutTests1.cs
View File

@ -13,7 +13,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataLut.ClutTestData), MemberType = typeof(IccTestDataLut))] [MemberData(nameof(IccTestDataLut.ClutTestData), MemberType = typeof(IccTestDataLut))]
internal void WriteClutAll(byte[] expected, IccClut data, int inChannelCount, int outChannelCount, bool isFloat) internal void WriteClutAll(byte[] expected, IccClut data, int inChannelCount, int outChannelCount, bool isFloat)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteClut(data); writer.WriteClut(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -25,7 +25,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataLut.Clut8TestData), MemberType = typeof(IccTestDataLut))] [MemberData(nameof(IccTestDataLut.Clut8TestData), MemberType = typeof(IccTestDataLut))]
internal void WriteClut8(byte[] expected, IccClut data, int inChannelCount, int outChannelCount, byte[] gridPointCount) internal void WriteClut8(byte[] expected, IccClut data, int inChannelCount, int outChannelCount, byte[] gridPointCount)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteClut8(data); writer.WriteClut8(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -37,7 +37,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataLut.Clut16TestData), MemberType = typeof(IccTestDataLut))] [MemberData(nameof(IccTestDataLut.Clut16TestData), MemberType = typeof(IccTestDataLut))]
internal void WriteClut16(byte[] expected, IccClut data, int inChannelCount, int outChannelCount, byte[] gridPointCount) internal void WriteClut16(byte[] expected, IccClut data, int inChannelCount, int outChannelCount, byte[] gridPointCount)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteClut16(data); writer.WriteClut16(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -49,7 +49,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataLut.ClutF32TestData), MemberType = typeof(IccTestDataLut))] [MemberData(nameof(IccTestDataLut.ClutF32TestData), MemberType = typeof(IccTestDataLut))]
internal void WriteClutF32(byte[] expected, IccClut data, int inChannelCount, int outChannelCount, byte[] gridPointCount) internal void WriteClutF32(byte[] expected, IccClut data, int inChannelCount, int outChannelCount, byte[] gridPointCount)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteClutF32(data); writer.WriteClutF32(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -61,7 +61,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataLut.Lut8TestData), MemberType = typeof(IccTestDataLut))] [MemberData(nameof(IccTestDataLut.Lut8TestData), MemberType = typeof(IccTestDataLut))]
internal void WriteLut8(byte[] expected, IccLut data) internal void WriteLut8(byte[] expected, IccLut data)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteLut8(data); writer.WriteLut8(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -73,7 +73,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataLut.Lut16TestData), MemberType = typeof(IccTestDataLut))] [MemberData(nameof(IccTestDataLut.Lut16TestData), MemberType = typeof(IccTestDataLut))]
internal void WriteLut16(byte[] expected, IccLut data, int count) internal void WriteLut16(byte[] expected, IccLut data, int count)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteLut16(data); writer.WriteLut16(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -81,7 +81,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
Assert.Equal(expected, output); Assert.Equal(expected, output);
} }
private IccDataWriter CreateWriter() private static IccDataWriter CreateWriter()
{ {
return new IccDataWriter(); return new IccDataWriter();
} }

14
tests/ImageSharp.Tests/Metadata/Profiles/ICC/DataWriter/IccDataWriterLutTests2.cs
View File

@ -13,7 +13,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataLut.ClutTestData), MemberType = typeof(IccTestDataLut))] [MemberData(nameof(IccTestDataLut.ClutTestData), MemberType = typeof(IccTestDataLut))]
internal void WriteClutAll(byte[] expected, IccClut data, int inChannelCount, int outChannelCount, bool isFloat) internal void WriteClutAll(byte[] expected, IccClut data, int inChannelCount, int outChannelCount, bool isFloat)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteClut(data); writer.WriteClut(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -25,7 +25,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataLut.Clut8TestData), MemberType = typeof(IccTestDataLut))] [MemberData(nameof(IccTestDataLut.Clut8TestData), MemberType = typeof(IccTestDataLut))]
internal void WriteClut8(byte[] expected, IccClut data, int inChannelCount, int outChannelCount, byte[] gridPointCount) internal void WriteClut8(byte[] expected, IccClut data, int inChannelCount, int outChannelCount, byte[] gridPointCount)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteClut8(data); writer.WriteClut8(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -37,7 +37,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataLut.Clut16TestData), MemberType = typeof(IccTestDataLut))] [MemberData(nameof(IccTestDataLut.Clut16TestData), MemberType = typeof(IccTestDataLut))]
internal void WriteClut16(byte[] expected, IccClut data, int inChannelCount, int outChannelCount, byte[] gridPointCount) internal void WriteClut16(byte[] expected, IccClut data, int inChannelCount, int outChannelCount, byte[] gridPointCount)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteClut16(data); writer.WriteClut16(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -49,7 +49,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataLut.ClutF32TestData), MemberType = typeof(IccTestDataLut))] [MemberData(nameof(IccTestDataLut.ClutF32TestData), MemberType = typeof(IccTestDataLut))]
internal void WriteClutF32(byte[] expected, IccClut data, int inChannelCount, int outChannelCount, byte[] gridPointCount) internal void WriteClutF32(byte[] expected, IccClut data, int inChannelCount, int outChannelCount, byte[] gridPointCount)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteClutF32(data); writer.WriteClutF32(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -61,7 +61,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataLut.Lut8TestData), MemberType = typeof(IccTestDataLut))] [MemberData(nameof(IccTestDataLut.Lut8TestData), MemberType = typeof(IccTestDataLut))]
internal void WriteLut8(byte[] expected, IccLut data) internal void WriteLut8(byte[] expected, IccLut data)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteLut8(data); writer.WriteLut8(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -73,7 +73,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataLut.Lut16TestData), MemberType = typeof(IccTestDataLut))] [MemberData(nameof(IccTestDataLut.Lut16TestData), MemberType = typeof(IccTestDataLut))]
internal void WriteLut16(byte[] expected, IccLut data, int count) internal void WriteLut16(byte[] expected, IccLut data, int count)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteLut16(data); writer.WriteLut16(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -81,7 +81,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
Assert.Equal(expected, output); Assert.Equal(expected, output);
} }
private IccDataWriter CreateWriter() private static IccDataWriter CreateWriter()
{ {
return new IccDataWriter(); return new IccDataWriter();
} }

12
tests/ImageSharp.Tests/Metadata/Profiles/ICC/DataWriter/IccDataWriterMatrixTests.cs
View File

@ -15,7 +15,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataMatrix.Matrix2D_FloatArrayTestData), MemberType = typeof(IccTestDataMatrix))] [MemberData(nameof(IccTestDataMatrix.Matrix2D_FloatArrayTestData), MemberType = typeof(IccTestDataMatrix))]
public void WriteMatrix2D_Array(byte[] expected, int xCount, int yCount, bool isSingle, float[,] data) public void WriteMatrix2D_Array(byte[] expected, int xCount, int yCount, bool isSingle, float[,] data)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteMatrix(data, isSingle); writer.WriteMatrix(data, isSingle);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -27,7 +27,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataMatrix.Matrix2D_Matrix4x4TestData), MemberType = typeof(IccTestDataMatrix))] [MemberData(nameof(IccTestDataMatrix.Matrix2D_Matrix4x4TestData), MemberType = typeof(IccTestDataMatrix))]
public void WriteMatrix2D_Matrix4x4(byte[] expected, int xCount, int yCount, bool isSingle, Matrix4x4 data) public void WriteMatrix2D_Matrix4x4(byte[] expected, int xCount, int yCount, bool isSingle, Matrix4x4 data)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteMatrix(data, isSingle); writer.WriteMatrix(data, isSingle);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -39,7 +39,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataMatrix.Matrix2D_DenseMatrixTestData), MemberType = typeof(IccTestDataMatrix))] [MemberData(nameof(IccTestDataMatrix.Matrix2D_DenseMatrixTestData), MemberType = typeof(IccTestDataMatrix))]
internal void WriteMatrix2D_DenseMatrix(byte[] expected, int xCount, int yCount, bool isSingle, in DenseMatrix<float> data) internal void WriteMatrix2D_DenseMatrix(byte[] expected, int xCount, int yCount, bool isSingle, in DenseMatrix<float> data)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteMatrix(data, isSingle); writer.WriteMatrix(data, isSingle);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -51,7 +51,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataMatrix.Matrix1D_ArrayTestData), MemberType = typeof(IccTestDataMatrix))] [MemberData(nameof(IccTestDataMatrix.Matrix1D_ArrayTestData), MemberType = typeof(IccTestDataMatrix))]
public void WriteMatrix1D_Array(byte[] expected, int yCount, bool isSingle, float[] data) public void WriteMatrix1D_Array(byte[] expected, int yCount, bool isSingle, float[] data)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteMatrix(data, isSingle); writer.WriteMatrix(data, isSingle);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -63,7 +63,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataMatrix.Matrix1D_Vector3TestData), MemberType = typeof(IccTestDataMatrix))] [MemberData(nameof(IccTestDataMatrix.Matrix1D_Vector3TestData), MemberType = typeof(IccTestDataMatrix))]
public void WriteMatrix1D_Vector3(byte[] expected, int yCount, bool isSingle, Vector3 data) public void WriteMatrix1D_Vector3(byte[] expected, int yCount, bool isSingle, Vector3 data)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteMatrix(data, isSingle); writer.WriteMatrix(data, isSingle);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -71,7 +71,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
Assert.Equal(expected, output); Assert.Equal(expected, output);
} }
private IccDataWriter CreateWriter() private static IccDataWriter CreateWriter()
{ {
return new IccDataWriter(); return new IccDataWriter();
} }

10
tests/ImageSharp.Tests/Metadata/Profiles/ICC/DataWriter/IccDataWriterMultiProcessElementTests.cs
View File

@ -13,7 +13,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataMultiProcessElements.MultiProcessElementTestData), MemberType = typeof(IccTestDataMultiProcessElements))] [MemberData(nameof(IccTestDataMultiProcessElements.MultiProcessElementTestData), MemberType = typeof(IccTestDataMultiProcessElements))]
internal void WriteMultiProcessElement(byte[] expected, IccMultiProcessElement data) internal void WriteMultiProcessElement(byte[] expected, IccMultiProcessElement data)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteMultiProcessElement(data); writer.WriteMultiProcessElement(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -25,7 +25,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataMultiProcessElements.CurveSetTestData), MemberType = typeof(IccTestDataMultiProcessElements))] [MemberData(nameof(IccTestDataMultiProcessElements.CurveSetTestData), MemberType = typeof(IccTestDataMultiProcessElements))]
internal void WriteCurveSetProcessElement(byte[] expected, IccCurveSetProcessElement data, int inChannelCount, int outChannelCount) internal void WriteCurveSetProcessElement(byte[] expected, IccCurveSetProcessElement data, int inChannelCount, int outChannelCount)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteCurveSetProcessElement(data); writer.WriteCurveSetProcessElement(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -37,7 +37,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataMultiProcessElements.MatrixTestData), MemberType = typeof(IccTestDataMultiProcessElements))] [MemberData(nameof(IccTestDataMultiProcessElements.MatrixTestData), MemberType = typeof(IccTestDataMultiProcessElements))]
internal void WriteMatrixProcessElement(byte[] expected, IccMatrixProcessElement data, int inChannelCount, int outChannelCount) internal void WriteMatrixProcessElement(byte[] expected, IccMatrixProcessElement data, int inChannelCount, int outChannelCount)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteMatrixProcessElement(data); writer.WriteMatrixProcessElement(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -49,7 +49,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataMultiProcessElements.ClutTestData), MemberType = typeof(IccTestDataMultiProcessElements))] [MemberData(nameof(IccTestDataMultiProcessElements.ClutTestData), MemberType = typeof(IccTestDataMultiProcessElements))]
internal void WriteClutProcessElement(byte[] expected, IccClutProcessElement data, int inChannelCount, int outChannelCount) internal void WriteClutProcessElement(byte[] expected, IccClutProcessElement data, int inChannelCount, int outChannelCount)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteClutProcessElement(data); writer.WriteClutProcessElement(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -57,7 +57,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
Assert.Equal(expected, output); Assert.Equal(expected, output);
} }
private IccDataWriter CreateWriter() private static IccDataWriter CreateWriter()
{ {
return new IccDataWriter(); return new IccDataWriter();
} }

20
tests/ImageSharp.Tests/Metadata/Profiles/ICC/DataWriter/IccDataWriterNonPrimitivesTests.cs
View File

@ -15,7 +15,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataNonPrimitives.DateTimeTestData), MemberType = typeof(IccTestDataNonPrimitives))] [MemberData(nameof(IccTestDataNonPrimitives.DateTimeTestData), MemberType = typeof(IccTestDataNonPrimitives))]
public void WriteDateTime(byte[] expected, DateTime data) public void WriteDateTime(byte[] expected, DateTime data)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteDateTime(data); writer.WriteDateTime(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -27,7 +27,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataNonPrimitives.VersionNumberTestData), MemberType = typeof(IccTestDataNonPrimitives))] [MemberData(nameof(IccTestDataNonPrimitives.VersionNumberTestData), MemberType = typeof(IccTestDataNonPrimitives))]
public void WriteVersionNumber(byte[] expected, IccVersion data) public void WriteVersionNumber(byte[] expected, IccVersion data)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteVersionNumber(data); writer.WriteVersionNumber(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -39,7 +39,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataNonPrimitives.XyzNumberTestData), MemberType = typeof(IccTestDataNonPrimitives))] [MemberData(nameof(IccTestDataNonPrimitives.XyzNumberTestData), MemberType = typeof(IccTestDataNonPrimitives))]
public void WriteXyzNumber(byte[] expected, Vector3 data) public void WriteXyzNumber(byte[] expected, Vector3 data)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteXyzNumber(data); writer.WriteXyzNumber(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -51,7 +51,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataNonPrimitives.ProfileIdTestData), MemberType = typeof(IccTestDataNonPrimitives))] [MemberData(nameof(IccTestDataNonPrimitives.ProfileIdTestData), MemberType = typeof(IccTestDataNonPrimitives))]
internal void WriteProfileId(byte[] expected, IccProfileId data) internal void WriteProfileId(byte[] expected, IccProfileId data)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteProfileId(data); writer.WriteProfileId(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -63,7 +63,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataNonPrimitives.PositionNumberTestData), MemberType = typeof(IccTestDataNonPrimitives))] [MemberData(nameof(IccTestDataNonPrimitives.PositionNumberTestData), MemberType = typeof(IccTestDataNonPrimitives))]
internal void WritePositionNumber(byte[] expected, IccPositionNumber data) internal void WritePositionNumber(byte[] expected, IccPositionNumber data)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WritePositionNumber(data); writer.WritePositionNumber(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -75,7 +75,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataNonPrimitives.ResponseNumberTestData), MemberType = typeof(IccTestDataNonPrimitives))] [MemberData(nameof(IccTestDataNonPrimitives.ResponseNumberTestData), MemberType = typeof(IccTestDataNonPrimitives))]
internal void WriteResponseNumber(byte[] expected, IccResponseNumber data) internal void WriteResponseNumber(byte[] expected, IccResponseNumber data)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteResponseNumber(data); writer.WriteResponseNumber(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -87,7 +87,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataNonPrimitives.NamedColorTestData), MemberType = typeof(IccTestDataNonPrimitives))] [MemberData(nameof(IccTestDataNonPrimitives.NamedColorTestData), MemberType = typeof(IccTestDataNonPrimitives))]
internal void WriteNamedColor(byte[] expected, IccNamedColor data, uint coordinateCount) internal void WriteNamedColor(byte[] expected, IccNamedColor data, uint coordinateCount)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteNamedColor(data); writer.WriteNamedColor(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -99,7 +99,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataNonPrimitives.ProfileDescriptionWriteTestData), MemberType = typeof(IccTestDataNonPrimitives))] [MemberData(nameof(IccTestDataNonPrimitives.ProfileDescriptionWriteTestData), MemberType = typeof(IccTestDataNonPrimitives))]
internal void WriteProfileDescription(byte[] expected, IccProfileDescription data) internal void WriteProfileDescription(byte[] expected, IccProfileDescription data)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteProfileDescription(data); writer.WriteProfileDescription(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -111,7 +111,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataNonPrimitives.ScreeningChannelTestData), MemberType = typeof(IccTestDataNonPrimitives))] [MemberData(nameof(IccTestDataNonPrimitives.ScreeningChannelTestData), MemberType = typeof(IccTestDataNonPrimitives))]
internal void WriteScreeningChannel(byte[] expected, IccScreeningChannel data) internal void WriteScreeningChannel(byte[] expected, IccScreeningChannel data)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteScreeningChannel(data); writer.WriteScreeningChannel(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -119,7 +119,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
Assert.Equal(expected, output); Assert.Equal(expected, output);
} }
private IccDataWriter CreateWriter() private static IccDataWriter CreateWriter()
{ {
return new IccDataWriter(); return new IccDataWriter();
} }

20
tests/ImageSharp.Tests/Metadata/Profiles/ICC/DataWriter/IccDataWriterPrimitivesTests.cs
View File

@ -14,7 +14,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataPrimitives.AsciiWriteTestData), MemberType = typeof(IccTestDataPrimitives))] [MemberData(nameof(IccTestDataPrimitives.AsciiWriteTestData), MemberType = typeof(IccTestDataPrimitives))]
public void WriteAsciiString(byte[] expected, string data) public void WriteAsciiString(byte[] expected, string data)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteAsciiString(data); writer.WriteAsciiString(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -26,7 +26,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataPrimitives.AsciiPaddingTestData), MemberType = typeof(IccTestDataPrimitives))] [MemberData(nameof(IccTestDataPrimitives.AsciiPaddingTestData), MemberType = typeof(IccTestDataPrimitives))]
public void WriteAsciiStringPadded(byte[] expected, int length, string data, bool ensureNullTerminator) public void WriteAsciiStringPadded(byte[] expected, int length, string data, bool ensureNullTerminator)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteAsciiString(data, length, ensureNullTerminator); writer.WriteAsciiString(data, length, ensureNullTerminator);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -37,7 +37,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[Fact] [Fact]
public void WriteAsciiStringWithNullWritesEmpty() public void WriteAsciiStringWithNullWritesEmpty()
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
int count = writer.WriteAsciiString(null); int count = writer.WriteAsciiString(null);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -49,7 +49,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[Fact] [Fact]
public void WriteAsciiStringWithNegativeLengthThrowsArgumentException() public void WriteAsciiStringWithNegativeLengthThrowsArgumentException()
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
Assert.Throws<ArgumentOutOfRangeException>(() => writer.WriteAsciiString("abcd", -1, false)); Assert.Throws<ArgumentOutOfRangeException>(() => writer.WriteAsciiString("abcd", -1, false));
} }
@ -57,7 +57,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[Fact] [Fact]
public void WriteUnicodeStringWithNullWritesEmpty() public void WriteUnicodeStringWithNullWritesEmpty()
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
int count = writer.WriteUnicodeString(null); int count = writer.WriteUnicodeString(null);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -70,7 +70,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataPrimitives.Fix16TestData), MemberType = typeof(IccTestDataPrimitives))] [MemberData(nameof(IccTestDataPrimitives.Fix16TestData), MemberType = typeof(IccTestDataPrimitives))]
public void WriteFix16(byte[] expected, float data) public void WriteFix16(byte[] expected, float data)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteFix16(data); writer.WriteFix16(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -82,7 +82,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataPrimitives.UFix16TestData), MemberType = typeof(IccTestDataPrimitives))] [MemberData(nameof(IccTestDataPrimitives.UFix16TestData), MemberType = typeof(IccTestDataPrimitives))]
public void WriteUFix16(byte[] expected, float data) public void WriteUFix16(byte[] expected, float data)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteUFix16(data); writer.WriteUFix16(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -94,7 +94,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataPrimitives.U1Fix15TestData), MemberType = typeof(IccTestDataPrimitives))] [MemberData(nameof(IccTestDataPrimitives.U1Fix15TestData), MemberType = typeof(IccTestDataPrimitives))]
public void WriteU1Fix15(byte[] expected, float data) public void WriteU1Fix15(byte[] expected, float data)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteU1Fix15(data); writer.WriteU1Fix15(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -106,7 +106,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataPrimitives.UFix8TestData), MemberType = typeof(IccTestDataPrimitives))] [MemberData(nameof(IccTestDataPrimitives.UFix8TestData), MemberType = typeof(IccTestDataPrimitives))]
public void WriteUFix8(byte[] expected, float data) public void WriteUFix8(byte[] expected, float data)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteUFix8(data); writer.WriteUFix8(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -114,7 +114,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
Assert.Equal(expected, output); Assert.Equal(expected, output);
} }
private IccDataWriter CreateWriter() private static IccDataWriter CreateWriter()
{ {
return new IccDataWriter(); return new IccDataWriter();
} }

68
tests/ImageSharp.Tests/Metadata/Profiles/ICC/DataWriter/IccDataWriterTagDataEntryTests.cs
View File

@ -13,7 +13,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataTagDataEntry.UnknownTagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))] [MemberData(nameof(IccTestDataTagDataEntry.UnknownTagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))]
internal void WriteUnknownTagDataEntry(byte[] expected, IccUnknownTagDataEntry data, uint size) internal void WriteUnknownTagDataEntry(byte[] expected, IccUnknownTagDataEntry data, uint size)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteUnknownTagDataEntry(data); writer.WriteUnknownTagDataEntry(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -25,7 +25,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataTagDataEntry.ChromaticityTagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))] [MemberData(nameof(IccTestDataTagDataEntry.ChromaticityTagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))]
internal void WriteChromaticityTagDataEntry(byte[] expected, IccChromaticityTagDataEntry data) internal void WriteChromaticityTagDataEntry(byte[] expected, IccChromaticityTagDataEntry data)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteChromaticityTagDataEntry(data); writer.WriteChromaticityTagDataEntry(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -37,7 +37,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataTagDataEntry.ColorantOrderTagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))] [MemberData(nameof(IccTestDataTagDataEntry.ColorantOrderTagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))]
internal void WriteColorantOrderTagDataEntry(byte[] expected, IccColorantOrderTagDataEntry data) internal void WriteColorantOrderTagDataEntry(byte[] expected, IccColorantOrderTagDataEntry data)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteColorantOrderTagDataEntry(data); writer.WriteColorantOrderTagDataEntry(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -49,7 +49,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataTagDataEntry.ColorantTableTagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))] [MemberData(nameof(IccTestDataTagDataEntry.ColorantTableTagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))]
internal void WriteColorantTableTagDataEntry(byte[] expected, IccColorantTableTagDataEntry data) internal void WriteColorantTableTagDataEntry(byte[] expected, IccColorantTableTagDataEntry data)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteColorantTableTagDataEntry(data); writer.WriteColorantTableTagDataEntry(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -61,7 +61,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataTagDataEntry.CurveTagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))] [MemberData(nameof(IccTestDataTagDataEntry.CurveTagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))]
internal void WriteCurveTagDataEntry(byte[] expected, IccCurveTagDataEntry data) internal void WriteCurveTagDataEntry(byte[] expected, IccCurveTagDataEntry data)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteCurveTagDataEntry(data); writer.WriteCurveTagDataEntry(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -73,7 +73,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataTagDataEntry.DataTagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))] [MemberData(nameof(IccTestDataTagDataEntry.DataTagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))]
internal void WriteDataTagDataEntry(byte[] expected, IccDataTagDataEntry data, uint size) internal void WriteDataTagDataEntry(byte[] expected, IccDataTagDataEntry data, uint size)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteDataTagDataEntry(data); writer.WriteDataTagDataEntry(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -85,7 +85,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataTagDataEntry.DateTimeTagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))] [MemberData(nameof(IccTestDataTagDataEntry.DateTimeTagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))]
internal void WriteDateTimeTagDataEntry(byte[] expected, IccDateTimeTagDataEntry data) internal void WriteDateTimeTagDataEntry(byte[] expected, IccDateTimeTagDataEntry data)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteDateTimeTagDataEntry(data); writer.WriteDateTimeTagDataEntry(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -97,7 +97,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataTagDataEntry.Lut16TagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))] [MemberData(nameof(IccTestDataTagDataEntry.Lut16TagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))]
internal void WriteLut16TagDataEntry(byte[] expected, IccLut16TagDataEntry data) internal void WriteLut16TagDataEntry(byte[] expected, IccLut16TagDataEntry data)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteLut16TagDataEntry(data); writer.WriteLut16TagDataEntry(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -109,7 +109,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataTagDataEntry.Lut8TagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))] [MemberData(nameof(IccTestDataTagDataEntry.Lut8TagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))]
internal void WriteLut8TagDataEntry(byte[] expected, IccLut8TagDataEntry data) internal void WriteLut8TagDataEntry(byte[] expected, IccLut8TagDataEntry data)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteLut8TagDataEntry(data); writer.WriteLut8TagDataEntry(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -121,7 +121,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataTagDataEntry.LutAToBTagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))] [MemberData(nameof(IccTestDataTagDataEntry.LutAToBTagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))]
internal void WriteLutAToBTagDataEntry(byte[] expected, IccLutAToBTagDataEntry data) internal void WriteLutAToBTagDataEntry(byte[] expected, IccLutAToBTagDataEntry data)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteLutAtoBTagDataEntry(data); writer.WriteLutAtoBTagDataEntry(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -133,7 +133,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataTagDataEntry.LutBToATagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))] [MemberData(nameof(IccTestDataTagDataEntry.LutBToATagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))]
internal void WriteLutBToATagDataEntry(byte[] expected, IccLutBToATagDataEntry data) internal void WriteLutBToATagDataEntry(byte[] expected, IccLutBToATagDataEntry data)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteLutBtoATagDataEntry(data); writer.WriteLutBtoATagDataEntry(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -145,7 +145,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataTagDataEntry.MeasurementTagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))] [MemberData(nameof(IccTestDataTagDataEntry.MeasurementTagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))]
internal void WriteMeasurementTagDataEntry(byte[] expected, IccMeasurementTagDataEntry data) internal void WriteMeasurementTagDataEntry(byte[] expected, IccMeasurementTagDataEntry data)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteMeasurementTagDataEntry(data); writer.WriteMeasurementTagDataEntry(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -157,7 +157,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataTagDataEntry.MultiLocalizedUnicodeTagDataEntryTestData_Write), MemberType = typeof(IccTestDataTagDataEntry))] [MemberData(nameof(IccTestDataTagDataEntry.MultiLocalizedUnicodeTagDataEntryTestData_Write), MemberType = typeof(IccTestDataTagDataEntry))]
internal void WriteMultiLocalizedUnicodeTagDataEntry(byte[] expected, IccMultiLocalizedUnicodeTagDataEntry data) internal void WriteMultiLocalizedUnicodeTagDataEntry(byte[] expected, IccMultiLocalizedUnicodeTagDataEntry data)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteMultiLocalizedUnicodeTagDataEntry(data); writer.WriteMultiLocalizedUnicodeTagDataEntry(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -169,7 +169,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataTagDataEntry.MultiProcessElementsTagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))] [MemberData(nameof(IccTestDataTagDataEntry.MultiProcessElementsTagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))]
internal void WriteMultiProcessElementsTagDataEntry(byte[] expected, IccMultiProcessElementsTagDataEntry data) internal void WriteMultiProcessElementsTagDataEntry(byte[] expected, IccMultiProcessElementsTagDataEntry data)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteMultiProcessElementsTagDataEntry(data); writer.WriteMultiProcessElementsTagDataEntry(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -181,7 +181,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataTagDataEntry.NamedColor2TagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))] [MemberData(nameof(IccTestDataTagDataEntry.NamedColor2TagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))]
internal void WriteNamedColor2TagDataEntry(byte[] expected, IccNamedColor2TagDataEntry data) internal void WriteNamedColor2TagDataEntry(byte[] expected, IccNamedColor2TagDataEntry data)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteNamedColor2TagDataEntry(data); writer.WriteNamedColor2TagDataEntry(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -193,7 +193,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataTagDataEntry.ParametricCurveTagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))] [MemberData(nameof(IccTestDataTagDataEntry.ParametricCurveTagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))]
internal void WriteParametricCurveTagDataEntry(byte[] expected, IccParametricCurveTagDataEntry data) internal void WriteParametricCurveTagDataEntry(byte[] expected, IccParametricCurveTagDataEntry data)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteParametricCurveTagDataEntry(data); writer.WriteParametricCurveTagDataEntry(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -205,7 +205,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataTagDataEntry.ProfileSequenceDescTagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))] [MemberData(nameof(IccTestDataTagDataEntry.ProfileSequenceDescTagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))]
internal void WriteProfileSequenceDescTagDataEntry(byte[] expected, IccProfileSequenceDescTagDataEntry data) internal void WriteProfileSequenceDescTagDataEntry(byte[] expected, IccProfileSequenceDescTagDataEntry data)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteProfileSequenceDescTagDataEntry(data); writer.WriteProfileSequenceDescTagDataEntry(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -217,7 +217,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataTagDataEntry.ProfileSequenceIdentifierTagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))] [MemberData(nameof(IccTestDataTagDataEntry.ProfileSequenceIdentifierTagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))]
internal void WriteProfileSequenceIdentifierTagDataEntry(byte[] expected, IccProfileSequenceIdentifierTagDataEntry data) internal void WriteProfileSequenceIdentifierTagDataEntry(byte[] expected, IccProfileSequenceIdentifierTagDataEntry data)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteProfileSequenceIdentifierTagDataEntry(data); writer.WriteProfileSequenceIdentifierTagDataEntry(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -229,7 +229,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataTagDataEntry.ResponseCurveSet16TagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))] [MemberData(nameof(IccTestDataTagDataEntry.ResponseCurveSet16TagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))]
internal void WriteResponseCurveSet16TagDataEntry(byte[] expected, IccResponseCurveSet16TagDataEntry data) internal void WriteResponseCurveSet16TagDataEntry(byte[] expected, IccResponseCurveSet16TagDataEntry data)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteResponseCurveSet16TagDataEntry(data); writer.WriteResponseCurveSet16TagDataEntry(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -241,7 +241,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataTagDataEntry.Fix16ArrayTagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))] [MemberData(nameof(IccTestDataTagDataEntry.Fix16ArrayTagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))]
internal void WriteFix16ArrayTagDataEntry(byte[] expected, IccFix16ArrayTagDataEntry data, uint size) internal void WriteFix16ArrayTagDataEntry(byte[] expected, IccFix16ArrayTagDataEntry data, uint size)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteFix16ArrayTagDataEntry(data); writer.WriteFix16ArrayTagDataEntry(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -253,7 +253,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataTagDataEntry.SignatureTagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))] [MemberData(nameof(IccTestDataTagDataEntry.SignatureTagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))]
internal void WriteSignatureTagDataEntry(byte[] expected, IccSignatureTagDataEntry data) internal void WriteSignatureTagDataEntry(byte[] expected, IccSignatureTagDataEntry data)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteSignatureTagDataEntry(data); writer.WriteSignatureTagDataEntry(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -265,7 +265,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataTagDataEntry.TextTagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))] [MemberData(nameof(IccTestDataTagDataEntry.TextTagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))]
internal void WriteTextTagDataEntry(byte[] expected, IccTextTagDataEntry data, uint size) internal void WriteTextTagDataEntry(byte[] expected, IccTextTagDataEntry data, uint size)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteTextTagDataEntry(data); writer.WriteTextTagDataEntry(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -277,7 +277,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataTagDataEntry.UFix16ArrayTagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))] [MemberData(nameof(IccTestDataTagDataEntry.UFix16ArrayTagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))]
internal void WriteUFix16ArrayTagDataEntry(byte[] expected, IccUFix16ArrayTagDataEntry data, uint size) internal void WriteUFix16ArrayTagDataEntry(byte[] expected, IccUFix16ArrayTagDataEntry data, uint size)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteUFix16ArrayTagDataEntry(data); writer.WriteUFix16ArrayTagDataEntry(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -289,7 +289,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataTagDataEntry.UInt16ArrayTagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))] [MemberData(nameof(IccTestDataTagDataEntry.UInt16ArrayTagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))]
internal void WriteUInt16ArrayTagDataEntry(byte[] expected, IccUInt16ArrayTagDataEntry data, uint size) internal void WriteUInt16ArrayTagDataEntry(byte[] expected, IccUInt16ArrayTagDataEntry data, uint size)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteUInt16ArrayTagDataEntry(data); writer.WriteUInt16ArrayTagDataEntry(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -301,7 +301,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataTagDataEntry.UInt32ArrayTagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))] [MemberData(nameof(IccTestDataTagDataEntry.UInt32ArrayTagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))]
internal void WriteUInt32ArrayTagDataEntry(byte[] expected, IccUInt32ArrayTagDataEntry data, uint size) internal void WriteUInt32ArrayTagDataEntry(byte[] expected, IccUInt32ArrayTagDataEntry data, uint size)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteUInt32ArrayTagDataEntry(data); writer.WriteUInt32ArrayTagDataEntry(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -313,7 +313,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataTagDataEntry.UInt64ArrayTagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))] [MemberData(nameof(IccTestDataTagDataEntry.UInt64ArrayTagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))]
internal void WriteUInt64ArrayTagDataEntry(byte[] expected, IccUInt64ArrayTagDataEntry data, uint size) internal void WriteUInt64ArrayTagDataEntry(byte[] expected, IccUInt64ArrayTagDataEntry data, uint size)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteUInt64ArrayTagDataEntry(data); writer.WriteUInt64ArrayTagDataEntry(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -325,7 +325,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataTagDataEntry.UInt8ArrayTagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))] [MemberData(nameof(IccTestDataTagDataEntry.UInt8ArrayTagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))]
internal void WriteUInt8ArrayTagDataEntry(byte[] expected, IccUInt8ArrayTagDataEntry data, uint size) internal void WriteUInt8ArrayTagDataEntry(byte[] expected, IccUInt8ArrayTagDataEntry data, uint size)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteUInt8ArrayTagDataEntry(data); writer.WriteUInt8ArrayTagDataEntry(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -337,7 +337,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataTagDataEntry.ViewingConditionsTagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))] [MemberData(nameof(IccTestDataTagDataEntry.ViewingConditionsTagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))]
internal void WriteViewingConditionsTagDataEntry(byte[] expected, IccViewingConditionsTagDataEntry data) internal void WriteViewingConditionsTagDataEntry(byte[] expected, IccViewingConditionsTagDataEntry data)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteViewingConditionsTagDataEntry(data); writer.WriteViewingConditionsTagDataEntry(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -349,7 +349,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataTagDataEntry.XYZTagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))] [MemberData(nameof(IccTestDataTagDataEntry.XYZTagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))]
internal void WriteXyzTagDataEntry(byte[] expected, IccXyzTagDataEntry data, uint size) internal void WriteXyzTagDataEntry(byte[] expected, IccXyzTagDataEntry data, uint size)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteXyzTagDataEntry(data); writer.WriteXyzTagDataEntry(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -361,7 +361,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataTagDataEntry.TextDescriptionTagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))] [MemberData(nameof(IccTestDataTagDataEntry.TextDescriptionTagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))]
internal void WriteTextDescriptionTagDataEntry(byte[] expected, IccTextDescriptionTagDataEntry data) internal void WriteTextDescriptionTagDataEntry(byte[] expected, IccTextDescriptionTagDataEntry data)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteTextDescriptionTagDataEntry(data); writer.WriteTextDescriptionTagDataEntry(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -373,7 +373,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataTagDataEntry.CrdInfoTagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))] [MemberData(nameof(IccTestDataTagDataEntry.CrdInfoTagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))]
internal void WriteCrdInfoTagDataEntry(byte[] expected, IccCrdInfoTagDataEntry data) internal void WriteCrdInfoTagDataEntry(byte[] expected, IccCrdInfoTagDataEntry data)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteCrdInfoTagDataEntry(data); writer.WriteCrdInfoTagDataEntry(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -385,7 +385,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataTagDataEntry.ScreeningTagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))] [MemberData(nameof(IccTestDataTagDataEntry.ScreeningTagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))]
internal void WriteScreeningTagDataEntry(byte[] expected, IccScreeningTagDataEntry data) internal void WriteScreeningTagDataEntry(byte[] expected, IccScreeningTagDataEntry data)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteScreeningTagDataEntry(data); writer.WriteScreeningTagDataEntry(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -397,7 +397,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataTagDataEntry.UcrBgTagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))] [MemberData(nameof(IccTestDataTagDataEntry.UcrBgTagDataEntryTestData), MemberType = typeof(IccTestDataTagDataEntry))]
internal void WriteUcrBgTagDataEntry(byte[] expected, IccUcrBgTagDataEntry data, uint size) internal void WriteUcrBgTagDataEntry(byte[] expected, IccUcrBgTagDataEntry data, uint size)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteUcrBgTagDataEntry(data); writer.WriteUcrBgTagDataEntry(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -405,7 +405,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
Assert.Equal(expected, output); Assert.Equal(expected, output);
} }
private IccDataWriter CreateWriter() private static IccDataWriter CreateWriter()
{ {
return new IccDataWriter(); return new IccDataWriter();
} }

18
tests/ImageSharp.Tests/Metadata/Profiles/ICC/DataWriter/IccDataWriterTests.cs
View File

@ -12,7 +12,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[Fact] [Fact]
public void WriteEmpty() public void WriteEmpty()
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteEmpty(4); writer.WriteEmpty(4);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -25,7 +25,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[InlineData(4, 4)] [InlineData(4, 4)]
public void WritePadding(int writePosition, int expectedLength) public void WritePadding(int writePosition, int expectedLength)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteEmpty(writePosition); writer.WriteEmpty(writePosition);
writer.WritePadding(); writer.WritePadding();
@ -38,7 +38,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataArray.UInt8TestData), MemberType = typeof(IccTestDataArray))] [MemberData(nameof(IccTestDataArray.UInt8TestData), MemberType = typeof(IccTestDataArray))]
public void WriteArrayUInt8(byte[] data, byte[] expected) public void WriteArrayUInt8(byte[] data, byte[] expected)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteArray(data); writer.WriteArray(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -50,7 +50,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataArray.UInt16TestData), MemberType = typeof(IccTestDataArray))] [MemberData(nameof(IccTestDataArray.UInt16TestData), MemberType = typeof(IccTestDataArray))]
public void WriteArrayUInt16(byte[] expected, ushort[] data) public void WriteArrayUInt16(byte[] expected, ushort[] data)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteArray(data); writer.WriteArray(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -62,7 +62,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataArray.Int16TestData), MemberType = typeof(IccTestDataArray))] [MemberData(nameof(IccTestDataArray.Int16TestData), MemberType = typeof(IccTestDataArray))]
public void WriteArrayInt16(byte[] expected, short[] data) public void WriteArrayInt16(byte[] expected, short[] data)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteArray(data); writer.WriteArray(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -74,7 +74,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataArray.UInt32TestData), MemberType = typeof(IccTestDataArray))] [MemberData(nameof(IccTestDataArray.UInt32TestData), MemberType = typeof(IccTestDataArray))]
public void WriteArrayUInt32(byte[] expected, uint[] data) public void WriteArrayUInt32(byte[] expected, uint[] data)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteArray(data); writer.WriteArray(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -86,7 +86,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataArray.Int32TestData), MemberType = typeof(IccTestDataArray))] [MemberData(nameof(IccTestDataArray.Int32TestData), MemberType = typeof(IccTestDataArray))]
public void WriteArrayInt32(byte[] expected, int[] data) public void WriteArrayInt32(byte[] expected, int[] data)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteArray(data); writer.WriteArray(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -98,7 +98,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
[MemberData(nameof(IccTestDataArray.UInt64TestData), MemberType = typeof(IccTestDataArray))] [MemberData(nameof(IccTestDataArray.UInt64TestData), MemberType = typeof(IccTestDataArray))]
public void WriteArrayUInt64(byte[] expected, ulong[] data) public void WriteArrayUInt64(byte[] expected, ulong[] data)
{ {
IccDataWriter writer = this.CreateWriter(); using IccDataWriter writer = CreateWriter();
writer.WriteArray(data); writer.WriteArray(data);
byte[] output = writer.GetData(); byte[] output = writer.GetData();
@ -106,7 +106,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataWriter
Assert.Equal(expected, output); Assert.Equal(expected, output);
} }
private IccDataWriter CreateWriter() private static IccDataWriter CreateWriter()
{ {
return new IccDataWriter(); return new IccDataWriter();
} }

3
tests/ImageSharp.Tests/TestUtilities/ImageProviders/TestPatternProvider.cs
View File

@ -3,7 +3,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Numerics;
using SixLabors.ImageSharp.Memory; using SixLabors.ImageSharp.Memory;
using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.PixelFormats;
@ -65,7 +64,7 @@ namespace SixLabors.ImageSharp.Tests
/// <summary> /// <summary>
/// Draws the test pattern on an image by drawing 4 other patterns in the for quadrants of the image. /// Draws the test pattern on an image by drawing 4 other patterns in the for quadrants of the image.
/// </summary> /// </summary>
/// <param name="image">The image to rdaw on.</param> /// <param name="image">The image to draw on.</param>
private static void DrawTestPattern(Image<TPixel> image) private static void DrawTestPattern(Image<TPixel> image)
{ {
// first lets split the image into 4 quadrants // first lets split the image into 4 quadrants

3
tests/ImageSharp.Tests/TestUtilities/TestUtils.cs
View File

@ -7,7 +7,6 @@ using System.Globalization;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
using SixLabors.ImageSharp.Advanced;
using SixLabors.ImageSharp.Memory; using SixLabors.ImageSharp.Memory;
using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.PixelFormats;
using SixLabors.ImageSharp.Processing; using SixLabors.ImageSharp.Processing;
@ -354,7 +353,7 @@ namespace SixLabors.ImageSharp.Tests
} }
} }
public static string AsInvariantString(this FormattableString formattable) => System.FormattableString.Invariant(formattable); public static string AsInvariantString(this FormattableString formattable) => FormattableString.Invariant(formattable);
public static IResampler GetResampler(string name) public static IResampler GetResampler(string name)
{ {

Write Preview
Loading…
Cancel
Save