Browse Source

more consistent naming

af/merge-core
Johannes Bildstein 9 years ago
parent
commit
04b94c90a0
  1. 2
      src/ImageSharp/MetaData/Profiles/ICC/DataReader/IccDataReader.Lut.cs
  2. 10
      src/ImageSharp/MetaData/Profiles/ICC/DataReader/IccDataReader.MultiProcessElement.cs
  3. 4
      src/ImageSharp/MetaData/Profiles/ICC/DataReader/IccDataReader.TagDataEntry.cs

2
src/ImageSharp/MetaData/Profiles/ICC/DataReader/IccDataReader.Lut.cs

@ -45,7 +45,7 @@ namespace ImageSharp
/// <param name="isFloat">If true, it's read as CLUTf32,
/// else read as either CLUT8 or CLUT16 depending on embedded information</param>
/// <returns>The read CLUT</returns>
public IccClut ReadCLUT(int inChannelCount, int outChannelCount, bool isFloat)
public IccClut ReadClut(int inChannelCount, int outChannelCount, bool isFloat)
{
// Grid-points are always 16 bytes long but only 0-inChCount are used
byte[] gridPointCount = new byte[inChannelCount];

10
src/ImageSharp/MetaData/Profiles/ICC/DataReader/IccDataReader.MultiProcessElement.cs

@ -27,7 +27,7 @@ namespace ImageSharp
case IccMultiProcessElementSignature.Matrix:
return this.ReadMatrixProcessElement(inChannelCount, outChannelCount);
case IccMultiProcessElementSignature.Clut:
return this.ReadCLUTProcessElement(inChannelCount, outChannelCount);
return this.ReadClutProcessElement(inChannelCount, outChannelCount);
// Currently just placeholders for future ICC expansion
case IccMultiProcessElementSignature.BAcs:
@ -76,12 +76,12 @@ namespace ImageSharp
/// <summary>
/// Reads a CLUT <see cref="IccMultiProcessElement"/>
/// </summary>
/// <param name="inChCount">Number of input channels</param>
/// <param name="outChCount">Number of output channels</param>
/// <param name="inChannelCount">Number of input channels</param>
/// <param name="outChannelCount">Number of output channels</param>
/// <returns>The read <see cref="IccClutProcessElement"/></returns>
public IccClutProcessElement ReadCLUTProcessElement(int inChCount, int outChCount)
public IccClutProcessElement ReadClutProcessElement(int inChannelCount, int outChannelCount)
{
return new IccClutProcessElement(this.ReadCLUT(inChCount, outChCount, true));
return new IccClutProcessElement(this.ReadClut(inChannelCount, outChannelCount, true));
}
}
}

4
src/ImageSharp/MetaData/Profiles/ICC/DataReader/IccDataReader.TagDataEntry.cs

@ -361,7 +361,7 @@ namespace ImageSharp
if (clutOffset != 0)
{
this.index = (int)clutOffset + start;
clut = this.ReadCLUT(inChCount, outChCount, false);
clut = this.ReadClut(inChCount, outChCount, false);
}
if (matrixOffset != 0)
@ -420,7 +420,7 @@ namespace ImageSharp
if (clutOffset != 0)
{
this.index = (int)clutOffset + start;
clut = this.ReadCLUT(inChCount, outChCount, false);
clut = this.ReadClut(inChCount, outChCount, false);
}
if (matrixOffset != 0)

Loading…
Cancel
Save