Browse Source

Make CreateReader static

pull/1635/head
Brian Popow 5 years ago
parent
commit
e2b745a151
  1. 2
      src/ImageSharp/Metadata/Profiles/ICC/DataReader/IccDataReader.cs
  2. 14
      tests/ImageSharp.Tests/Metadata/Profiles/ICC/DataReader/IccDataReaderCurvesTests.cs
  3. 14
      tests/ImageSharp.Tests/Metadata/Profiles/ICC/DataReader/IccDataReaderLutTests.cs
  4. 6
      tests/ImageSharp.Tests/Metadata/Profiles/ICC/DataReader/IccDataReaderMatrixTests.cs
  5. 10
      tests/ImageSharp.Tests/Metadata/Profiles/ICC/DataReader/IccDataReaderMultiProcessElementTests.cs
  6. 22
      tests/ImageSharp.Tests/Metadata/Profiles/ICC/DataReader/IccDataReaderNonPrimitivesTests.cs
  7. 16
      tests/ImageSharp.Tests/Metadata/Profiles/ICC/DataReader/IccDataReaderPrimitivesTests.cs
  8. 68
      tests/ImageSharp.Tests/Metadata/Profiles/ICC/DataReader/IccDataReaderTagDataEntryTests.cs

2
src/ImageSharp/Metadata/Profiles/ICC/DataReader/IccDataReader.cs

@ -3,7 +3,7 @@
using System;
namespace SixLabors.ImageSharp.Metadata.Profiles.ICC.DataReader
namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
{
/// <summary>
/// Provides methods to read ICC data types

14
tests/ImageSharp.Tests/Metadata/Profiles/ICC/DataReader/IccDataReaderCurvesTests.cs

@ -13,7 +13,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
[MemberData(nameof(IccTestDataCurves.OneDimensionalCurveTestData), MemberType = typeof(IccTestDataCurves))]
internal void ReadOneDimensionalCurve(byte[] data, IccOneDimensionalCurve expected)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
IccOneDimensionalCurve output = reader.ReadOneDimensionalCurve();
@ -24,7 +24,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
[MemberData(nameof(IccTestDataCurves.ResponseCurveTestData), MemberType = typeof(IccTestDataCurves))]
internal void ReadResponseCurve(byte[] data, IccResponseCurve expected, int channelCount)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
IccResponseCurve output = reader.ReadResponseCurve(channelCount);
@ -35,7 +35,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
[MemberData(nameof(IccTestDataCurves.ParametricCurveTestData), MemberType = typeof(IccTestDataCurves))]
internal void ReadParametricCurve(byte[] data, IccParametricCurve expected)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
IccParametricCurve output = reader.ReadParametricCurve();
@ -46,7 +46,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
[MemberData(nameof(IccTestDataCurves.CurveSegmentTestData), MemberType = typeof(IccTestDataCurves))]
internal void ReadCurveSegment(byte[] data, IccCurveSegment expected)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
IccCurveSegment output = reader.ReadCurveSegment();
@ -57,7 +57,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
[MemberData(nameof(IccTestDataCurves.FormulaCurveSegmentTestData), MemberType = typeof(IccTestDataCurves))]
internal void ReadFormulaCurveElement(byte[] data, IccFormulaCurveElement expected)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
IccFormulaCurveElement output = reader.ReadFormulaCurveElement();
@ -68,14 +68,14 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
[MemberData(nameof(IccTestDataCurves.SampledCurveSegmentTestData), MemberType = typeof(IccTestDataCurves))]
internal void ReadSampledCurveElement(byte[] data, IccSampledCurveElement expected)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
IccSampledCurveElement output = reader.ReadSampledCurveElement();
Assert.Equal(expected, output);
}
private IccDataReader CreateReader(byte[] data)
private static IccDataReader CreateReader(byte[] data)
{
return new IccDataReader(data);
}

14
tests/ImageSharp.Tests/Metadata/Profiles/ICC/DataReader/IccDataReaderLutTests.cs

@ -13,7 +13,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
[MemberData(nameof(IccTestDataLut.ClutTestData), MemberType = typeof(IccTestDataLut))]
internal void ReadClut(byte[] data, IccClut expected, int inChannelCount, int outChannelCount, bool isFloat)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
IccClut output = reader.ReadClut(inChannelCount, outChannelCount, isFloat);
@ -24,7 +24,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
[MemberData(nameof(IccTestDataLut.Clut8TestData), MemberType = typeof(IccTestDataLut))]
internal void ReadClut8(byte[] data, IccClut expected, int inChannelCount, int outChannelCount, byte[] gridPointCount)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
IccClut output = reader.ReadClut8(inChannelCount, outChannelCount, gridPointCount);
@ -35,7 +35,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
[MemberData(nameof(IccTestDataLut.Clut16TestData), MemberType = typeof(IccTestDataLut))]
internal void ReadClut16(byte[] data, IccClut expected, int inChannelCount, int outChannelCount, byte[] gridPointCount)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
IccClut output = reader.ReadClut16(inChannelCount, outChannelCount, gridPointCount);
@ -46,7 +46,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
[MemberData(nameof(IccTestDataLut.ClutF32TestData), MemberType = typeof(IccTestDataLut))]
internal void ReadClutF32(byte[] data, IccClut expected, int inChannelCount, int outChannelCount, byte[] gridPointCount)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
IccClut output = reader.ReadClutF32(inChannelCount, outChannelCount, gridPointCount);
@ -57,7 +57,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
[MemberData(nameof(IccTestDataLut.Lut8TestData), MemberType = typeof(IccTestDataLut))]
internal void ReadLut8(byte[] data, IccLut expected)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
IccLut output = reader.ReadLut8();
@ -68,14 +68,14 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
[MemberData(nameof(IccTestDataLut.Lut16TestData), MemberType = typeof(IccTestDataLut))]
internal void ReadLut16(byte[] data, IccLut expected, int count)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
IccLut output = reader.ReadLut16(count);
Assert.Equal(expected, output);
}
private IccDataReader CreateReader(byte[] data)
private static IccDataReader CreateReader(byte[] data)
{
return new IccDataReader(data);
}

6
tests/ImageSharp.Tests/Metadata/Profiles/ICC/DataReader/IccDataReaderMatrixTests.cs

@ -13,7 +13,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
[MemberData(nameof(IccTestDataMatrix.Matrix2D_FloatArrayTestData), MemberType = typeof(IccTestDataMatrix))]
public void ReadMatrix2D(byte[] data, int xCount, int yCount, bool isSingle, float[,] expected)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
float[,] output = reader.ReadMatrix(xCount, yCount, isSingle);
@ -24,14 +24,14 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
[MemberData(nameof(IccTestDataMatrix.Matrix1D_ArrayTestData), MemberType = typeof(IccTestDataMatrix))]
public void ReadMatrix1D(byte[] data, int yCount, bool isSingle, float[] expected)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
float[] output = reader.ReadMatrix(yCount, isSingle);
Assert.Equal(expected, output);
}
private IccDataReader CreateReader(byte[] data)
private static IccDataReader CreateReader(byte[] data)
{
return new IccDataReader(data);
}

10
tests/ImageSharp.Tests/Metadata/Profiles/ICC/DataReader/IccDataReaderMultiProcessElementTests.cs

@ -13,7 +13,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
[MemberData(nameof(IccTestDataMultiProcessElements.MultiProcessElementTestData), MemberType = typeof(IccTestDataMultiProcessElements))]
internal void ReadMultiProcessElement(byte[] data, IccMultiProcessElement expected)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
IccMultiProcessElement output = reader.ReadMultiProcessElement();
@ -24,7 +24,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
[MemberData(nameof(IccTestDataMultiProcessElements.CurveSetTestData), MemberType = typeof(IccTestDataMultiProcessElements))]
internal void ReadCurveSetProcessElement(byte[] data, IccCurveSetProcessElement expected, int inChannelCount, int outChannelCount)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
IccCurveSetProcessElement output = reader.ReadCurveSetProcessElement(inChannelCount, outChannelCount);
@ -35,7 +35,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
[MemberData(nameof(IccTestDataMultiProcessElements.MatrixTestData), MemberType = typeof(IccTestDataMultiProcessElements))]
internal void ReadMatrixProcessElement(byte[] data, IccMatrixProcessElement expected, int inChannelCount, int outChannelCount)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
IccMatrixProcessElement output = reader.ReadMatrixProcessElement(inChannelCount, outChannelCount);
@ -46,14 +46,14 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
[MemberData(nameof(IccTestDataMultiProcessElements.ClutTestData), MemberType = typeof(IccTestDataMultiProcessElements))]
internal void ReadClutProcessElement(byte[] data, IccClutProcessElement expected, int inChannelCount, int outChannelCount)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
IccClutProcessElement output = reader.ReadClutProcessElement(inChannelCount, outChannelCount);
Assert.Equal(expected, output);
}
private IccDataReader CreateReader(byte[] data)
private static IccDataReader CreateReader(byte[] data)
{
return new IccDataReader(data);
}

22
tests/ImageSharp.Tests/Metadata/Profiles/ICC/DataReader/IccDataReaderNonPrimitivesTests.cs

@ -15,7 +15,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
[MemberData(nameof(IccTestDataNonPrimitives.DateTimeTestData), MemberType = typeof(IccTestDataNonPrimitives))]
public void ReadDateTime(byte[] data, DateTime expected)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
DateTime output = reader.ReadDateTime();
@ -26,7 +26,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
[MemberData(nameof(IccTestDataNonPrimitives.VersionNumberTestData), MemberType = typeof(IccTestDataNonPrimitives))]
public void ReadVersionNumber(byte[] data, IccVersion expected)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
IccVersion output = reader.ReadVersionNumber();
@ -37,7 +37,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
[MemberData(nameof(IccTestDataNonPrimitives.XyzNumberTestData), MemberType = typeof(IccTestDataNonPrimitives))]
public void ReadXyzNumber(byte[] data, Vector3 expected)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
Vector3 output = reader.ReadXyzNumber();
@ -48,7 +48,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
[MemberData(nameof(IccTestDataNonPrimitives.ProfileIdTestData), MemberType = typeof(IccTestDataNonPrimitives))]
internal void ReadProfileId(byte[] data, IccProfileId expected)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
IccProfileId output = reader.ReadProfileId();
@ -59,7 +59,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
[MemberData(nameof(IccTestDataNonPrimitives.PositionNumberTestData), MemberType = typeof(IccTestDataNonPrimitives))]
internal void ReadPositionNumber(byte[] data, IccPositionNumber expected)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
IccPositionNumber output = reader.ReadPositionNumber();
@ -70,7 +70,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
[MemberData(nameof(IccTestDataNonPrimitives.ResponseNumberTestData), MemberType = typeof(IccTestDataNonPrimitives))]
internal void ReadResponseNumber(byte[] data, IccResponseNumber expected)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
IccResponseNumber output = reader.ReadResponseNumber();
@ -81,7 +81,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
[MemberData(nameof(IccTestDataNonPrimitives.NamedColorTestData), MemberType = typeof(IccTestDataNonPrimitives))]
internal void ReadNamedColor(byte[] data, IccNamedColor expected, uint coordinateCount)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
IccNamedColor output = reader.ReadNamedColor(coordinateCount);
@ -92,7 +92,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
[MemberData(nameof(IccTestDataNonPrimitives.ProfileDescriptionReadTestData), MemberType = typeof(IccTestDataNonPrimitives))]
internal void ReadProfileDescription(byte[] data, IccProfileDescription expected)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
IccProfileDescription output = reader.ReadProfileDescription();
@ -103,7 +103,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
[MemberData(nameof(IccTestDataNonPrimitives.ColorantTableEntryTestData), MemberType = typeof(IccTestDataNonPrimitives))]
internal void ReadColorantTableEntry(byte[] data, IccColorantTableEntry expected)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
IccColorantTableEntry output = reader.ReadColorantTableEntry();
@ -114,14 +114,14 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
[MemberData(nameof(IccTestDataNonPrimitives.ScreeningChannelTestData), MemberType = typeof(IccTestDataNonPrimitives))]
internal void ReadScreeningChannel(byte[] data, IccScreeningChannel expected)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
IccScreeningChannel output = reader.ReadScreeningChannel();
Assert.Equal(expected, output);
}
private IccDataReader CreateReader(byte[] data)
private static IccDataReader CreateReader(byte[] data)
{
return new IccDataReader(data);
}

16
tests/ImageSharp.Tests/Metadata/Profiles/ICC/DataReader/IccDataReaderPrimitivesTests.cs

@ -14,7 +14,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
[MemberData(nameof(IccTestDataPrimitives.AsciiTestData), MemberType = typeof(IccTestDataPrimitives))]
public void ReadAsciiString(byte[] textBytes, int length, string expected)
{
IccDataReader reader = this.CreateReader(textBytes);
IccDataReader reader = CreateReader(textBytes);
string output = reader.ReadAsciiString(length);
@ -24,7 +24,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
[Fact]
public void ReadAsciiStringWithNegativeLengthThrowsArgumentException()
{
IccDataReader reader = this.CreateReader(new byte[4]);
IccDataReader reader = CreateReader(new byte[4]);
Assert.Throws<ArgumentOutOfRangeException>(() => reader.ReadAsciiString(-1));
}
@ -32,7 +32,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
[Fact]
public void ReadUnicodeStringWithNegativeLengthThrowsArgumentException()
{
IccDataReader reader = this.CreateReader(new byte[4]);
IccDataReader reader = CreateReader(new byte[4]);
Assert.Throws<ArgumentOutOfRangeException>(() => reader.ReadUnicodeString(-1));
}
@ -41,7 +41,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
[MemberData(nameof(IccTestDataPrimitives.Fix16TestData), MemberType = typeof(IccTestDataPrimitives))]
public void ReadFix16(byte[] data, float expected)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
float output = reader.ReadFix16();
@ -52,7 +52,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
[MemberData(nameof(IccTestDataPrimitives.UFix16TestData), MemberType = typeof(IccTestDataPrimitives))]
public void ReadUFix16(byte[] data, float expected)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
float output = reader.ReadUFix16();
@ -63,7 +63,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
[MemberData(nameof(IccTestDataPrimitives.U1Fix15TestData), MemberType = typeof(IccTestDataPrimitives))]
public void ReadU1Fix15(byte[] data, float expected)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
float output = reader.ReadU1Fix15();
@ -74,14 +74,14 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
[MemberData(nameof(IccTestDataPrimitives.UFix8TestData), MemberType = typeof(IccTestDataPrimitives))]
public void ReadUFix8(byte[] data, float expected)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
float output = reader.ReadUFix8();
Assert.Equal(expected, output);
}
private IccDataReader CreateReader(byte[] data)
private static IccDataReader CreateReader(byte[] data)
{
return new IccDataReader(data);
}

68
tests/ImageSharp.Tests/Metadata/Profiles/ICC/DataReader/IccDataReaderTagDataEntryTests.cs

@ -15,7 +15,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
MemberType = typeof(IccTestDataTagDataEntry))]
internal void ReadUnknownTagDataEntry(byte[] data, IccUnknownTagDataEntry expected, uint size)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
IccUnknownTagDataEntry output = reader.ReadUnknownTagDataEntry(size);
@ -28,7 +28,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
MemberType = typeof(IccTestDataTagDataEntry))]
internal void ReadChromaticityTagDataEntry(byte[] data, IccChromaticityTagDataEntry expected)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
IccChromaticityTagDataEntry output = reader.ReadChromaticityTagDataEntry();
@ -41,7 +41,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
MemberType = typeof(IccTestDataTagDataEntry))]
internal void ReadColorantOrderTagDataEntry(byte[] data, IccColorantOrderTagDataEntry expected)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
IccColorantOrderTagDataEntry output = reader.ReadColorantOrderTagDataEntry();
@ -54,7 +54,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
MemberType = typeof(IccTestDataTagDataEntry))]
internal void ReadColorantTableTagDataEntry(byte[] data, IccColorantTableTagDataEntry expected)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
IccColorantTableTagDataEntry output = reader.ReadColorantTableTagDataEntry();
@ -67,7 +67,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
MemberType = typeof(IccTestDataTagDataEntry))]
internal void ReadCurveTagDataEntry(byte[] data, IccCurveTagDataEntry expected)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
IccCurveTagDataEntry output = reader.ReadCurveTagDataEntry();
@ -80,7 +80,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
MemberType = typeof(IccTestDataTagDataEntry))]
internal void ReadDataTagDataEntry(byte[] data, IccDataTagDataEntry expected, uint size)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
IccDataTagDataEntry output = reader.ReadDataTagDataEntry(size);
@ -93,7 +93,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
MemberType = typeof(IccTestDataTagDataEntry))]
internal void ReadDateTimeTagDataEntry(byte[] data, IccDateTimeTagDataEntry expected)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
IccDateTimeTagDataEntry output = reader.ReadDateTimeTagDataEntry();
@ -106,7 +106,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
MemberType = typeof(IccTestDataTagDataEntry))]
internal void ReadLut16TagDataEntry(byte[] data, IccLut16TagDataEntry expected)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
IccLut16TagDataEntry output = reader.ReadLut16TagDataEntry();
@ -119,7 +119,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
MemberType = typeof(IccTestDataTagDataEntry))]
internal void ReadLut8TagDataEntry(byte[] data, IccLut8TagDataEntry expected)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
IccLut8TagDataEntry output = reader.ReadLut8TagDataEntry();
@ -132,7 +132,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
MemberType = typeof(IccTestDataTagDataEntry))]
internal void ReadLutAToBTagDataEntry(byte[] data, IccLutAToBTagDataEntry expected)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
IccLutAToBTagDataEntry output = reader.ReadLutAtoBTagDataEntry();
@ -145,7 +145,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
MemberType = typeof(IccTestDataTagDataEntry))]
internal void ReadLutBToATagDataEntry(byte[] data, IccLutBToATagDataEntry expected)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
IccLutBToATagDataEntry output = reader.ReadLutBtoATagDataEntry();
@ -158,7 +158,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
MemberType = typeof(IccTestDataTagDataEntry))]
internal void ReadMeasurementTagDataEntry(byte[] data, IccMeasurementTagDataEntry expected)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
IccMeasurementTagDataEntry output = reader.ReadMeasurementTagDataEntry();
@ -171,7 +171,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
MemberType = typeof(IccTestDataTagDataEntry))]
internal void ReadMultiLocalizedUnicodeTagDataEntry(byte[] data, IccMultiLocalizedUnicodeTagDataEntry expected)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
IccMultiLocalizedUnicodeTagDataEntry output = reader.ReadMultiLocalizedUnicodeTagDataEntry();
@ -184,7 +184,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
MemberType = typeof(IccTestDataTagDataEntry))]
internal void ReadMultiProcessElementsTagDataEntry(byte[] data, IccMultiProcessElementsTagDataEntry expected)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
IccMultiProcessElementsTagDataEntry output = reader.ReadMultiProcessElementsTagDataEntry();
@ -197,7 +197,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
MemberType = typeof(IccTestDataTagDataEntry))]
internal void ReadNamedColor2TagDataEntry(byte[] data, IccNamedColor2TagDataEntry expected)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
IccNamedColor2TagDataEntry output = reader.ReadNamedColor2TagDataEntry();
@ -210,7 +210,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
MemberType = typeof(IccTestDataTagDataEntry))]
internal void ReadParametricCurveTagDataEntry(byte[] data, IccParametricCurveTagDataEntry expected)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
IccParametricCurveTagDataEntry output = reader.ReadParametricCurveTagDataEntry();
@ -223,7 +223,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
MemberType = typeof(IccTestDataTagDataEntry))]
internal void ReadProfileSequenceDescTagDataEntry(byte[] data, IccProfileSequenceDescTagDataEntry expected)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
IccProfileSequenceDescTagDataEntry output = reader.ReadProfileSequenceDescTagDataEntry();
@ -238,7 +238,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
byte[] data,
IccProfileSequenceIdentifierTagDataEntry expected)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
IccProfileSequenceIdentifierTagDataEntry output = reader.ReadProfileSequenceIdentifierTagDataEntry();
@ -251,7 +251,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
MemberType = typeof(IccTestDataTagDataEntry))]
internal void ReadResponseCurveSet16TagDataEntry(byte[] data, IccResponseCurveSet16TagDataEntry expected)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
IccResponseCurveSet16TagDataEntry output = reader.ReadResponseCurveSet16TagDataEntry();
@ -264,7 +264,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
MemberType = typeof(IccTestDataTagDataEntry))]
internal void ReadFix16ArrayTagDataEntry(byte[] data, IccFix16ArrayTagDataEntry expected, uint size)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
IccFix16ArrayTagDataEntry output = reader.ReadFix16ArrayTagDataEntry(size);
@ -277,7 +277,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
MemberType = typeof(IccTestDataTagDataEntry))]
internal void ReadSignatureTagDataEntry(byte[] data, IccSignatureTagDataEntry expected)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
IccSignatureTagDataEntry output = reader.ReadSignatureTagDataEntry();
@ -290,7 +290,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
MemberType = typeof(IccTestDataTagDataEntry))]
internal void ReadTextTagDataEntry(byte[] data, IccTextTagDataEntry expected, uint size)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
IccTextTagDataEntry output = reader.ReadTextTagDataEntry(size);
@ -303,7 +303,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
MemberType = typeof(IccTestDataTagDataEntry))]
internal void ReadUFix16ArrayTagDataEntry(byte[] data, IccUFix16ArrayTagDataEntry expected, uint size)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
IccUFix16ArrayTagDataEntry output = reader.ReadUFix16ArrayTagDataEntry(size);
@ -316,7 +316,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
MemberType = typeof(IccTestDataTagDataEntry))]
internal void ReadUInt16ArrayTagDataEntry(byte[] data, IccUInt16ArrayTagDataEntry expected, uint size)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
IccUInt16ArrayTagDataEntry output = reader.ReadUInt16ArrayTagDataEntry(size);
@ -329,7 +329,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
MemberType = typeof(IccTestDataTagDataEntry))]
internal void ReadUInt32ArrayTagDataEntry(byte[] data, IccUInt32ArrayTagDataEntry expected, uint size)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
IccUInt32ArrayTagDataEntry output = reader.ReadUInt32ArrayTagDataEntry(size);
@ -342,7 +342,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
MemberType = typeof(IccTestDataTagDataEntry))]
internal void ReadUInt64ArrayTagDataEntry(byte[] data, IccUInt64ArrayTagDataEntry expected, uint size)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
IccUInt64ArrayTagDataEntry output = reader.ReadUInt64ArrayTagDataEntry(size);
@ -355,7 +355,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
MemberType = typeof(IccTestDataTagDataEntry))]
internal void ReadUInt8ArrayTagDataEntry(byte[] data, IccUInt8ArrayTagDataEntry expected, uint size)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
IccUInt8ArrayTagDataEntry output = reader.ReadUInt8ArrayTagDataEntry(size);
@ -368,7 +368,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
MemberType = typeof(IccTestDataTagDataEntry))]
internal void ReadViewingConditionsTagDataEntry(byte[] data, IccViewingConditionsTagDataEntry expected)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
IccViewingConditionsTagDataEntry output = reader.ReadViewingConditionsTagDataEntry();
@ -381,7 +381,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
MemberType = typeof(IccTestDataTagDataEntry))]
internal void ReadXyzTagDataEntry(byte[] data, IccXyzTagDataEntry expected, uint size)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
IccXyzTagDataEntry output = reader.ReadXyzTagDataEntry(size);
@ -394,7 +394,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
MemberType = typeof(IccTestDataTagDataEntry))]
internal void ReadTextDescriptionTagDataEntry(byte[] data, IccTextDescriptionTagDataEntry expected)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
IccTextDescriptionTagDataEntry output = reader.ReadTextDescriptionTagDataEntry();
@ -407,7 +407,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
MemberType = typeof(IccTestDataTagDataEntry))]
internal void ReadCrdInfoTagDataEntry(byte[] data, IccCrdInfoTagDataEntry expected)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
IccCrdInfoTagDataEntry output = reader.ReadCrdInfoTagDataEntry();
@ -420,7 +420,7 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
MemberType = typeof(IccTestDataTagDataEntry))]
internal void ReadScreeningTagDataEntry(byte[] data, IccScreeningTagDataEntry expected)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
IccScreeningTagDataEntry output = reader.ReadScreeningTagDataEntry();
@ -433,14 +433,14 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.ICC.DataReader
MemberType = typeof(IccTestDataTagDataEntry))]
internal void ReadUcrBgTagDataEntry(byte[] data, IccUcrBgTagDataEntry expected, uint size)
{
IccDataReader reader = this.CreateReader(data);
IccDataReader reader = CreateReader(data);
IccUcrBgTagDataEntry output = reader.ReadUcrBgTagDataEntry(size);
Assert.Equal(expected, output);
}
private IccDataReader CreateReader(byte[] data)
private static IccDataReader CreateReader(byte[] data)
{
return new IccDataReader(data);
}

Loading…
Cancel
Save