diff --git a/src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.Curves.cs b/src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.Curves.cs index 120a6f299d..660d6f4271 100644 --- a/src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.Curves.cs +++ b/src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.Curves.cs @@ -52,7 +52,7 @@ namespace ImageSharp foreach (Vector3 xyz in value.XyzValues) { - count += this.WriteXYZNumber(xyz); + count += this.WriteXyzNumber(xyz); } foreach (IccResponseNumber[] responseArray in value.ResponseArrays) diff --git a/src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.Lut.cs b/src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.Lut.cs index 70325eca32..01360da640 100644 --- a/src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.Lut.cs +++ b/src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.Lut.cs @@ -15,7 +15,7 @@ namespace ImageSharp /// /// The LUT to write /// The number of bytes written - public int WriteLUT8(IccLut value) + public int WriteLut8(IccLut value) { foreach (double item in value.Values) { @@ -30,7 +30,7 @@ namespace ImageSharp /// /// The LUT to write /// The number of bytes written - public int WriteLUT16(IccLut value) + public int WriteLut16(IccLut value) { foreach (double item in value.Values) { @@ -45,7 +45,7 @@ namespace ImageSharp /// /// The CLUT to write /// The number of bytes written - public int WriteCLUT(IccClut value) + public int WriteClut(IccClut value) { int count = this.WriteArray(value.GridPointCount); count += this.WriteEmpty(16 - value.GridPointCount.Length); @@ -53,15 +53,15 @@ namespace ImageSharp switch (value.DataType) { case IccClutDataType.Float: - return count + this.WriteCLUTf32(value); + return count + this.WriteClutF32(value); case IccClutDataType.UInt8: count += this.WriteByte(1); count += this.WriteEmpty(3); - return count + this.WriteCLUT8(value); + return count + this.WriteClut8(value); case IccClutDataType.UInt16: count += this.WriteByte(2); count += this.WriteEmpty(3); - return count + this.WriteCLUT16(value); + return count + this.WriteClut16(value); default: throw new InvalidIccProfileException($"Invalid CLUT data type of {value.DataType}"); @@ -73,7 +73,7 @@ namespace ImageSharp /// /// The CLUT to write /// The number of bytes written - public int WriteCLUT8(IccClut value) + public int WriteClut8(IccClut value) { int count = 0; foreach (float[] inArray in value.Values) @@ -92,7 +92,7 @@ namespace ImageSharp /// /// The CLUT to write /// The number of bytes written - public int WriteCLUT16(IccClut value) + public int WriteClut16(IccClut value) { int count = 0; foreach (float[] inArray in value.Values) @@ -111,7 +111,7 @@ namespace ImageSharp /// /// The CLUT to write /// The number of bytes written - public int WriteCLUTf32(IccClut value) + public int WriteClutF32(IccClut value) { int count = 0; foreach (float[] inArray in value.Values) diff --git a/src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.MultiProcessElement.cs b/src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.MultiProcessElement.cs index 39b393abb7..b3ddb538cd 100644 --- a/src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.MultiProcessElement.cs +++ b/src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.MultiProcessElement.cs @@ -28,7 +28,7 @@ namespace ImageSharp case IccMultiProcessElementSignature.Matrix: return count + this.WriteMatrixProcessElement(value as IccMatrixProcessElement); case IccMultiProcessElementSignature.Clut: - return count + this.WriteCLUTProcessElement(value as IccClutProcessElement); + return count + this.WriteClutProcessElement(value as IccClutProcessElement); case IccMultiProcessElementSignature.BAcs: case IccMultiProcessElementSignature.EAcs: @@ -72,9 +72,9 @@ namespace ImageSharp /// /// The element to write /// The number of bytes written - public int WriteCLUTProcessElement(IccClutProcessElement value) + public int WriteClutProcessElement(IccClutProcessElement value) { - return this.WriteCLUT(value.ClutValue); + return this.WriteClut(value.ClutValue); } } } diff --git a/src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.NonPrimitives.cs b/src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.NonPrimitives.cs index 2aa1272623..5c57436d81 100644 --- a/src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.NonPrimitives.cs +++ b/src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.NonPrimitives.cs @@ -49,7 +49,7 @@ namespace ImageSharp /// /// The value to write /// the number of bytes written - public int WriteXYZNumber(Vector3 value) + public int WriteXyzNumber(Vector3 value) { return this.WriteFix16(value.X) + this.WriteFix16(value.Y) @@ -98,7 +98,7 @@ namespace ImageSharp /// the number of bytes written public int WriteNamedColor(IccNamedColor value) { - return this.WriteASCIIString(value.Name, 32, '\0') + return this.WriteAsciiString(value.Name, 32, '\0') + this.WriteArray(value.PcsCoordinates) + this.WriteArray(value.DeviceCoordinates); } diff --git a/src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.Primitives.cs b/src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.Primitives.cs index d6e9952b9c..509413f80e 100644 --- a/src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.Primitives.cs +++ b/src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.Primitives.cs @@ -173,7 +173,7 @@ namespace ImageSharp /// /// the string to write /// the number of bytes written - public int WriteASCIIString(string value) + public int WriteAsciiString(string value) { byte[] data = AsciiEncoding.GetBytes(value); this.dataStream.Write(data, 0, data.Length); @@ -187,7 +187,7 @@ namespace ImageSharp /// The desired length of the string including 1 padding character /// The character to pad to the given length /// the number of bytes written - public int WriteASCIIString(string value, int length, char paddingChar) + public int WriteAsciiString(string value, int length, char paddingChar) { value = value.Substring(0, Math.Min(length - 1, value.Length)); diff --git a/src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.TagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.TagDataEntry.cs index a87a0a187e..893c71dde0 100644 --- a/src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.TagDataEntry.cs +++ b/src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.TagDataEntry.cs @@ -196,7 +196,7 @@ namespace ImageSharp int count = this.WriteUInt32((uint)value.ColorantData.Length); foreach (IccColorantTableEntry colorant in value.ColorantData) { - count += this.WriteASCIIString(colorant.Name, 32, '\0'); + count += this.WriteAsciiString(colorant.Name, 32, '\0'); count += this.WriteUInt16(colorant.Pcs1); count += this.WriteUInt16(colorant.Pcs2); count += this.WriteUInt16(colorant.Pcs3); @@ -278,14 +278,14 @@ namespace ImageSharp foreach (IccLut lut in value.InputValues) { - count += this.WriteLUT16(lut); + count += this.WriteLut16(lut); } - count += this.WriteCLUT16(value.ClutValues); + count += this.WriteClut16(value.ClutValues); foreach (IccLut lut in value.OutputValues) { - count += this.WriteLUT16(lut); + count += this.WriteLut16(lut); } return count; @@ -307,14 +307,14 @@ namespace ImageSharp foreach (IccLut lut in value.InputValues) { - count += this.WriteLUT8(lut); + count += this.WriteLut8(lut); } - count += this.WriteCLUT8(value.ClutValues); + count += this.WriteClut8(value.ClutValues); foreach (IccLut lut in value.OutputValues) { - count += this.WriteLUT8(lut); + count += this.WriteLut8(lut); } return count; @@ -368,7 +368,7 @@ namespace ImageSharp if (value.ClutValues != null) { clutOffset = this.dataStream.Position; - count += this.WriteCLUT(value.ClutValues); + count += this.WriteClut(value.ClutValues); count += this.WritePadding(); } @@ -466,7 +466,7 @@ namespace ImageSharp if (value.ClutValues != null) { clutOffset = this.dataStream.Position; - count += this.WriteCLUT(value.ClutValues); + count += this.WriteClut(value.ClutValues); count += this.WritePadding(); } @@ -524,7 +524,7 @@ namespace ImageSharp public int WriteMeasurementTagDataEntry(IccMeasurementTagDataEntry value) { return this.WriteUInt32((uint)value.Observer) - + this.WriteXYZNumber(value.XyzBacking) + + this.WriteXyzNumber(value.XyzBacking) + this.WriteUInt32((uint)value.Geometry) + this.WriteUFix16(value.Flare) + this.WriteUInt32((uint)value.Illuminant); @@ -564,8 +564,8 @@ namespace ImageSharp { string[] code = value.Texts[i].Culture.Name.Split('-'); - count += this.WriteASCIIString(code[0].ToLower(), 2, ' '); - count += this.WriteASCIIString(code[1].ToUpper(), 2, ' '); + count += this.WriteAsciiString(code[0].ToLower(), 2, ' '); + count += this.WriteAsciiString(code[1].ToUpper(), 2, ' '); count += this.WriteUInt32((uint)lengths[i]); count += this.WriteUInt32(offset[i]); @@ -624,8 +624,8 @@ namespace ImageSharp int count = this.WriteInt32(value.VendorFlags) + this.WriteUInt32((uint)value.Colors.Length) + this.WriteUInt32((uint)value.CoordinateCount) - + this.WriteASCIIString(value.Prefix, 32, '\0') - + this.WriteASCIIString(value.Suffix, 32, '\0'); + + this.WriteAsciiString(value.Prefix, 32, '\0') + + this.WriteAsciiString(value.Suffix, 32, '\0'); foreach (IccNamedColor color in value.Colors) { @@ -757,7 +757,7 @@ namespace ImageSharp /// The number of bytes written public int WriteSignatureTagDataEntry(IccSignatureTagDataEntry value) { - return this.WriteASCIIString(value.SignatureData, 4, ' '); + return this.WriteAsciiString(value.SignatureData, 4, ' '); } /// @@ -767,7 +767,7 @@ namespace ImageSharp /// The number of bytes written public int WriteTextTagDataEntry(IccTextTagDataEntry value) { - return this.WriteASCIIString(value.Text); + return this.WriteAsciiString(value.Text); } /// @@ -833,8 +833,8 @@ namespace ImageSharp /// The number of bytes written public int WriteViewingConditionsTagDataEntry(IccViewingConditionsTagDataEntry value) { - return this.WriteXYZNumber(value.IlluminantXyz) - + this.WriteXYZNumber(value.SurroundXyz) + return this.WriteXyzNumber(value.IlluminantXyz) + + this.WriteXyzNumber(value.SurroundXyz) + this.WriteUInt32((uint)value.Illuminant); } @@ -848,7 +848,7 @@ namespace ImageSharp int count = 0; for (int i = 0; i < value.Data.Length; i++) { - count += this.WriteXYZNumber(value.Data[i]); + count += this.WriteXyzNumber(value.Data[i]); } return count; @@ -870,7 +870,7 @@ namespace ImageSharp else { this.dataStream.Position += 4; - count += size = this.WriteASCIIString(value.Ascii + '\0'); + count += size = this.WriteAsciiString(value.Ascii + '\0'); this.dataStream.Position -= size + 4; count += this.WriteUInt32((uint)size); this.dataStream.Position += size; @@ -900,7 +900,7 @@ namespace ImageSharp else { this.dataStream.Position += 3; - count += size = this.WriteASCIIString(value.ScriptCode, 67, '\0'); + count += size = this.WriteAsciiString(value.ScriptCode, 67, '\0'); this.dataStream.Position -= size + 3; count += this.WriteUInt16(value.ScriptCodeCode); count += this.WriteByte((byte)(value.ScriptCode.Length > 66 ? 67 : value.ScriptCode.Length)); diff --git a/src/ImageSharp/MetaData/Profiles/ICC/IccWriter.cs b/src/ImageSharp/MetaData/Profiles/ICC/IccWriter.cs index cd1d1f74df..5ff1f7af15 100644 --- a/src/ImageSharp/MetaData/Profiles/ICC/IccWriter.cs +++ b/src/ImageSharp/MetaData/Profiles/ICC/IccWriter.cs @@ -34,21 +34,21 @@ namespace ImageSharp writer.SetIndex(0); writer.WriteUInt32(writer.Length + 128); - writer.WriteASCIIString(header.CmmType, 4, ' '); + writer.WriteAsciiString(header.CmmType, 4, ' '); writer.WriteVersionNumber(header.Version); writer.WriteUInt32((uint)header.Class); writer.WriteUInt32((uint)header.DataColorSpace); writer.WriteUInt32((uint)header.ProfileConnectionSpace); writer.WriteDateTime(header.CreationDate); - writer.WriteASCIIString("acsp"); + writer.WriteAsciiString("acsp"); writer.WriteUInt32((uint)header.PrimaryPlatformSignature); writer.WriteInt32((int)header.Flags); writer.WriteUInt32(header.DeviceManufacturer); writer.WriteUInt32(header.DeviceModel); writer.WriteInt64((long)header.DeviceAttributes); writer.WriteUInt32((uint)header.RenderingIntent); - writer.WriteXYZNumber(header.PcsIlluminant); - writer.WriteASCIIString(header.CreatorSignature, 4, ' '); + writer.WriteXyzNumber(header.PcsIlluminant); + writer.WriteAsciiString(header.CreatorSignature, 4, ' '); #if !NETSTANDARD1_1 IccProfileId id = IccProfile.CalculateHash(writer.GetData());