diff --git a/src/ImageSharp/MetaData/Profiles/ICC/IccDataReader.cs b/src/ImageSharp/MetaData/Profiles/ICC/IccDataReader.cs index 83f04c2146..722fca885b 100644 --- a/src/ImageSharp/MetaData/Profiles/ICC/IccDataReader.cs +++ b/src/ImageSharp/MetaData/Profiles/ICC/IccDataReader.cs @@ -128,7 +128,7 @@ namespace ImageSharp /// /// number of bytes to read /// The value as a string - public string ReadASCIIString(int length) + public string ReadAsciiString(int length) { string value = AsciiEncoding.GetString(this.data, this.AddIndex(length), length); @@ -323,7 +323,7 @@ namespace ImageSharp /// the named color public IccNamedColor ReadNamedColor(uint deviceCoordCount) { - string name = this.ReadASCIIString(32); + string name = this.ReadAsciiString(32); ushort[] pcsCoord = new ushort[3] { this.ReadUInt16(), this.ReadUInt16(), this.ReadUInt16() }; ushort[] deviceCoord = new ushort[deviceCoordCount]; @@ -366,7 +366,7 @@ namespace ImageSharp public IccColorantTableEntry ReadColorantTableEntry() { return new IccColorantTableEntry( - name: this.ReadASCIIString(32), + name: this.ReadAsciiString(32), pcs1: this.ReadUInt16(), pcs2: this.ReadUInt16(), pcs3: this.ReadUInt16()); @@ -826,7 +826,7 @@ namespace ImageSharp for (int i = 0; i < recordCount; i++) { - culture[i] = $"{this.ReadASCIIString(2)}-{this.ReadASCIIString(2)}"; + culture[i] = $"{this.ReadAsciiString(2)}-{this.ReadAsciiString(2)}"; length[i] = this.ReadUInt32(); offset[i] = this.ReadUInt32(); } @@ -877,8 +877,8 @@ namespace ImageSharp int vendorFlag = this.ReadDirect32(); uint colorCount = this.ReadUInt32(); uint coordCount = this.ReadUInt32(); - string prefix = this.ReadASCIIString(32); - string suffix = this.ReadASCIIString(32); + string prefix = this.ReadAsciiString(32); + string suffix = this.ReadAsciiString(32); IccNamedColor[] colors = new IccNamedColor[colorCount]; for (int i = 0; i < colorCount; i++) @@ -990,7 +990,7 @@ namespace ImageSharp /// The read entry public IccSignatureTagDataEntry ReadSignatureTagDataEntry() { - return new IccSignatureTagDataEntry(this.ReadASCIIString(4)); + return new IccSignatureTagDataEntry(this.ReadAsciiString(4)); } /// @@ -1000,7 +1000,7 @@ namespace ImageSharp /// The read entry public IccTextTagDataEntry ReadTextTagDataEntry(uint size) { - return new IccTextTagDataEntry(this.ReadASCIIString((int)size - 8)); // 8 is the tag header size + return new IccTextTagDataEntry(this.ReadAsciiString((int)size - 8)); // 8 is the tag header size } /// @@ -1126,7 +1126,7 @@ namespace ImageSharp int asciiCount = (int)this.ReadUInt32(); if (asciiCount > 0) { - asciiValue = this.ReadASCIIString(asciiCount - 1); + asciiValue = this.ReadAsciiString(asciiCount - 1); this.AddIndex(1); // Null terminator } @@ -1142,7 +1142,7 @@ namespace ImageSharp int scriptcodeCount = Math.Min(this.data[this.AddIndex(1)], (byte)67); if (scriptcodeCount > 0) { - scriptcodeValue = this.ReadASCIIString(scriptcodeCount - 1); + scriptcodeValue = this.ReadAsciiString(scriptcodeCount - 1); this.AddIndex(1); // Null terminator } diff --git a/src/ImageSharp/MetaData/Profiles/ICC/IccReader.cs b/src/ImageSharp/MetaData/Profiles/ICC/IccReader.cs index faa86b6f97..89b5aff617 100644 --- a/src/ImageSharp/MetaData/Profiles/ICC/IccReader.cs +++ b/src/ImageSharp/MetaData/Profiles/ICC/IccReader.cs @@ -59,13 +59,13 @@ namespace ImageSharp return new IccProfileHeader { Size = reader.ReadUInt32(), - CmmType = reader.ReadASCIIString(4), + CmmType = reader.ReadAsciiString(4), Version = reader.ReadVersionNumber(), Class = (IccProfileClass)reader.ReadUInt32(), DataColorSpace = (IccColorSpaceType)reader.ReadUInt32(), ProfileConnectionSpace = (IccColorSpaceType)reader.ReadUInt32(), CreationDate = reader.ReadDateTime(), - FileSignature = reader.ReadASCIIString(4), + FileSignature = reader.ReadAsciiString(4), PrimaryPlatformSignature = (IccPrimaryPlatformType)reader.ReadUInt32(), Flags = (IccProfileFlag)reader.ReadDirect32(), DeviceManufacturer = reader.ReadUInt32(), @@ -73,7 +73,7 @@ namespace ImageSharp DeviceAttributes = (IccDeviceAttribute)reader.ReadDirect64(), RenderingIntent = (IccRenderingIntent)reader.ReadUInt32(), PcsIlluminant = reader.ReadXyzNumber(), - CreatorSignature = reader.ReadASCIIString(4), + CreatorSignature = reader.ReadAsciiString(4), Id = reader.ReadProfileId(), }; }