From 81b571f9ebe920792f62232b47d509698c602834 Mon Sep 17 00:00:00 2001 From: Johannes Bildstein Date: Fri, 24 Mar 2017 05:15:55 +0100 Subject: [PATCH] more consistent naming --- .../Profiles/ICC/DataReader/IccDataReader.Lut.cs | 16 ++++++++-------- .../ICC/DataReader/IccDataReader.TagDataEntry.cs | 12 ++++++------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/ImageSharp/MetaData/Profiles/ICC/DataReader/IccDataReader.Lut.cs b/src/ImageSharp/MetaData/Profiles/ICC/DataReader/IccDataReader.Lut.cs index b9156629fa..d37dccb72c 100644 --- a/src/ImageSharp/MetaData/Profiles/ICC/DataReader/IccDataReader.Lut.cs +++ b/src/ImageSharp/MetaData/Profiles/ICC/DataReader/IccDataReader.Lut.cs @@ -16,7 +16,7 @@ namespace ImageSharp /// Reads an 8bit lookup table /// /// The read LUT - public IccLut ReadLUT8() + public IccLut ReadLut8() { return new IccLut(this.ReadBytes(256)); } @@ -26,7 +26,7 @@ namespace ImageSharp /// /// The number of entries /// The read LUT - public IccLut ReadLUT16(int count) + public IccLut ReadLut16(int count) { ushort[] values = new ushort[count]; for (int i = 0; i < count; i++) @@ -56,11 +56,11 @@ namespace ImageSharp byte size = this.data[this.AddIndex(4)]; // First byte is info, last 3 bytes are reserved if (size == 1) { - return this.ReadCLUT8(inChannelCount, outChannelCount, gridPointCount); + return this.ReadClut8(inChannelCount, outChannelCount, gridPointCount); } else if (size == 2) { - return this.ReadCLUT16(inChannelCount, outChannelCount, gridPointCount); + return this.ReadClut16(inChannelCount, outChannelCount, gridPointCount); } else { @@ -69,7 +69,7 @@ namespace ImageSharp } else { - return this.ReadCLUTf32(inChannelCount, outChannelCount, gridPointCount); + return this.ReadClutF32(inChannelCount, outChannelCount, gridPointCount); } } @@ -80,7 +80,7 @@ namespace ImageSharp /// Output channel count /// Grid point count for each CLUT channel /// The read CLUT8 - public IccClut ReadCLUT8(int inChannelCount, int outChannelCount, byte[] gridPointCount) + public IccClut ReadClut8(int inChannelCount, int outChannelCount, byte[] gridPointCount) { int start = this.index; int length = 0; @@ -114,7 +114,7 @@ namespace ImageSharp /// Output channel count /// Grid point count for each CLUT channel /// The read CLUT16 - public IccClut ReadCLUT16(int inChannelCount, int outChannelCount, byte[] gridPointCount) + public IccClut ReadClut16(int inChannelCount, int outChannelCount, byte[] gridPointCount) { int start = this.index; int length = 0; @@ -148,7 +148,7 @@ namespace ImageSharp /// Output channel count /// Grid point count for each CLUT channel /// The read CLUTf32 - public IccClut ReadCLUTf32(int inChCount, int outChCount, byte[] gridPointCount) + public IccClut ReadClutF32(int inChCount, int outChCount, byte[] gridPointCount) { int start = this.index; int length = 0; diff --git a/src/ImageSharp/MetaData/Profiles/ICC/DataReader/IccDataReader.TagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/DataReader/IccDataReader.TagDataEntry.cs index 2aa1603e56..1034e4baa2 100644 --- a/src/ImageSharp/MetaData/Profiles/ICC/DataReader/IccDataReader.TagDataEntry.cs +++ b/src/ImageSharp/MetaData/Profiles/ICC/DataReader/IccDataReader.TagDataEntry.cs @@ -263,18 +263,18 @@ namespace ImageSharp byte[] gridPointCount = new byte[inChCount]; for (int i = 0; i < inChCount; i++) { - inValues[i] = this.ReadLUT16(inTableCount); + inValues[i] = this.ReadLut16(inTableCount); gridPointCount[i] = clutPointCount; } // CLUT - IccClut clut = this.ReadCLUT16(inChCount, outChCount, gridPointCount); + IccClut clut = this.ReadClut16(inChCount, outChCount, gridPointCount); // Output LUT IccLut[] outValues = new IccLut[outChCount]; for (int i = 0; i < outChCount; i++) { - outValues[i] = this.ReadLUT16(outTableCount); + outValues[i] = this.ReadLut16(outTableCount); } return new IccLut16TagDataEntry(matrix, inValues, clut, outValues); @@ -298,18 +298,18 @@ namespace ImageSharp byte[] gridPointCount = new byte[inChCount]; for (int i = 0; i < inChCount; i++) { - inValues[i] = this.ReadLUT8(); + inValues[i] = this.ReadLut8(); gridPointCount[i] = clutPointCount; } // CLUT - IccClut clut = this.ReadCLUT8(inChCount, outChCount, gridPointCount); + IccClut clut = this.ReadClut8(inChCount, outChCount, gridPointCount); // Output LUT IccLut[] outValues = new IccLut[outChCount]; for (int i = 0; i < outChCount; i++) { - outValues[i] = this.ReadLUT8(); + outValues[i] = this.ReadLut8(); } return new IccLut8TagDataEntry(matrix, inValues, clut, outValues);