Merge pull request #369 from drewnoakes/spanify-Iso2022Converter

drewnoakes · web-flow · commit cef227825264 · 2024-01-22T23:33:07.000+11:00
Spanify Iso2022Converter
diff --git a/MetadataExtractor.Tests/Formats/Iptc/Iso2022ConverterTest.cs b/MetadataExtractor.Tests/Formats/Iptc/Iso2022ConverterTest.cs
@@ -10,11 +10,11 @@ public sealed class Iso2022ConverterTest
         [Fact]
         public void ConvertEscapeSequenceToEncodingName()
         {
-            Assert.Equal("UTF-8", Iso2022Converter.ConvertEscapeSequenceToEncodingName(new byte[] { 0x1B, 0x25, 0x47 }));
-            //Assert.Equal("ISO-8859-1", Iso2022Converter.ConvertEscapeSequenceToEncodingName(new byte[] { 0x1B, 0x2E, 0x41 }));
-            Assert.Equal("ISO-8859-1", Iso2022Converter.ConvertEscapeSequenceToEncodingName(new byte[] { 0x1B, 0xE2, 0x80, 0xA2, 0x41 }));
-            Assert.Equal("ISO-8859-1", Iso2022Converter.ConvertEscapeSequenceToEncodingName(new byte[] { 0x1B, 0x2D, 0x41 }));
-            Assert.Null(Iso2022Converter.ConvertEscapeSequenceToEncodingName(new byte[] { 1, 2, 3, 4 }));
+            Assert.Equal("UTF-8", Iso2022Converter.ConvertEscapeSequenceToEncodingName([0x1B, 0x25, 0x47]));
+            //Assert.Equal("ISO-8859-1", Iso2022Converter.ConvertEscapeSequenceToEncodingName([0x1B, 0x2E, 0x41]));
+            Assert.Equal("ISO-8859-1", Iso2022Converter.ConvertEscapeSequenceToEncodingName([0x1B, 0xE2, 0x80, 0xA2, 0x41]));
+            Assert.Equal("ISO-8859-1", Iso2022Converter.ConvertEscapeSequenceToEncodingName([0x1B, 0x2D, 0x41]));
+            Assert.Null(Iso2022Converter.ConvertEscapeSequenceToEncodingName([1, 2, 3, 4]));
         }
     }
 }
diff --git a/MetadataExtractor/Formats/Iptc/Iso2022Converter.cs b/MetadataExtractor/Formats/Iptc/Iso2022Converter.cs
@@ -12,7 +12,7 @@ public static class Iso2022Converter
         private const byte Esc = 0x1B;
 
         /// <summary>Attempts to convert the given ISO2022 escape sequence to an encoding name.</summary>
-        public static string? ConvertEscapeSequenceToEncodingName(byte[] bytes)
+        public static string? ConvertEscapeSequenceToEncodingName(ReadOnlySpan<byte> bytes)
         {
             if (bytes.Length > 2 && bytes[0] == Esc && bytes[1] == PercentSign && bytes[2] == LatinCapitalG)
                 return "UTF-8";
diff --git a/MetadataExtractor/PublicAPI/net45/PublicAPI.Shipped.txt b/MetadataExtractor/PublicAPI/net45/PublicAPI.Shipped.txt
@@ -4348,7 +4348,7 @@ static MetadataExtractor.Formats.Heif.HeifMetadataReader.ReadMetadata(System.IO.
 static MetadataExtractor.Formats.Icc.IccReader.GetStringFromUInt32(uint d) -> string!
 static MetadataExtractor.Formats.Ico.IcoMetadataReader.ReadMetadata(string! filePath) -> System.Collections.Generic.IReadOnlyList<MetadataExtractor.Directory!>!
 static MetadataExtractor.Formats.Ico.IcoMetadataReader.ReadMetadata(System.IO.Stream! stream) -> System.Collections.Generic.IReadOnlyList<MetadataExtractor.Directory!>!
-static MetadataExtractor.Formats.Iptc.Iso2022Converter.ConvertEscapeSequenceToEncodingName(byte[]! bytes) -> string?
+static MetadataExtractor.Formats.Iptc.Iso2022Converter.ConvertEscapeSequenceToEncodingName(System.ReadOnlySpan<byte> bytes) -> string?
 static MetadataExtractor.Formats.Jpeg.HuffmanTable.TypeOf(int value) -> MetadataExtractor.Formats.Jpeg.HuffmanTableClass
 static MetadataExtractor.Formats.Jpeg.JpegMetadataReader.AllReaders.get -> System.Collections.Generic.IEnumerable<MetadataExtractor.Formats.Jpeg.IJpegSegmentMetadataReader!>!
 static MetadataExtractor.Formats.Jpeg.JpegMetadataReader.Process(System.IO.Stream! stream, System.Collections.Generic.ICollection<MetadataExtractor.Formats.Jpeg.IJpegSegmentMetadataReader!>? readers = null) -> System.Collections.Generic.IReadOnlyList<MetadataExtractor.Directory!>!
diff --git a/MetadataExtractor/PublicAPI/netstandard1.3/PublicAPI.Shipped.txt b/MetadataExtractor/PublicAPI/netstandard1.3/PublicAPI.Shipped.txt
@@ -4341,7 +4341,7 @@ static MetadataExtractor.Formats.Heif.HeifMetadataReader.ReadMetadata(System.IO.
 static MetadataExtractor.Formats.Icc.IccReader.GetStringFromUInt32(uint d) -> string!
 static MetadataExtractor.Formats.Ico.IcoMetadataReader.ReadMetadata(string! filePath) -> System.Collections.Generic.IReadOnlyList<MetadataExtractor.Directory!>!
 static MetadataExtractor.Formats.Ico.IcoMetadataReader.ReadMetadata(System.IO.Stream! stream) -> System.Collections.Generic.IReadOnlyList<MetadataExtractor.Directory!>!
-static MetadataExtractor.Formats.Iptc.Iso2022Converter.ConvertEscapeSequenceToEncodingName(byte[]! bytes) -> string?
+static MetadataExtractor.Formats.Iptc.Iso2022Converter.ConvertEscapeSequenceToEncodingName(System.ReadOnlySpan<byte> bytes) -> string?
 static MetadataExtractor.Formats.Jpeg.HuffmanTable.TypeOf(int value) -> MetadataExtractor.Formats.Jpeg.HuffmanTableClass
 static MetadataExtractor.Formats.Jpeg.JpegMetadataReader.AllReaders.get -> System.Collections.Generic.IEnumerable<MetadataExtractor.Formats.Jpeg.IJpegSegmentMetadataReader!>!
 static MetadataExtractor.Formats.Jpeg.JpegMetadataReader.Process(System.IO.Stream! stream, System.Collections.Generic.ICollection<MetadataExtractor.Formats.Jpeg.IJpegSegmentMetadataReader!>? readers = null) -> System.Collections.Generic.IReadOnlyList<MetadataExtractor.Directory!>!
diff --git a/MetadataExtractor/PublicAPI/netstandard2.1/PublicAPI.Shipped.txt b/MetadataExtractor/PublicAPI/netstandard2.1/PublicAPI.Shipped.txt
@@ -4348,7 +4348,7 @@ static MetadataExtractor.Formats.Heif.HeifMetadataReader.ReadMetadata(System.IO.
 static MetadataExtractor.Formats.Icc.IccReader.GetStringFromUInt32(uint d) -> string!
 static MetadataExtractor.Formats.Ico.IcoMetadataReader.ReadMetadata(string! filePath) -> System.Collections.Generic.IReadOnlyList<MetadataExtractor.Directory!>!
 static MetadataExtractor.Formats.Ico.IcoMetadataReader.ReadMetadata(System.IO.Stream! stream) -> System.Collections.Generic.IReadOnlyList<MetadataExtractor.Directory!>!
-static MetadataExtractor.Formats.Iptc.Iso2022Converter.ConvertEscapeSequenceToEncodingName(byte[]! bytes) -> string?
+static MetadataExtractor.Formats.Iptc.Iso2022Converter.ConvertEscapeSequenceToEncodingName(System.ReadOnlySpan<byte> bytes) -> string?
 static MetadataExtractor.Formats.Jpeg.HuffmanTable.TypeOf(int value) -> MetadataExtractor.Formats.Jpeg.HuffmanTableClass
 static MetadataExtractor.Formats.Jpeg.JpegMetadataReader.AllReaders.get -> System.Collections.Generic.IEnumerable<MetadataExtractor.Formats.Jpeg.IJpegSegmentMetadataReader!>!
 static MetadataExtractor.Formats.Jpeg.JpegMetadataReader.Process(System.IO.Stream! stream, System.Collections.Generic.ICollection<MetadataExtractor.Formats.Jpeg.IJpegSegmentMetadataReader!>? readers = null) -> System.Collections.Generic.IReadOnlyList<MetadataExtractor.Directory!>!

Original file line number	Diff line number	Diff line change
`@@ -10,11 +10,11 @@ public sealed class Iso2022ConverterTest`
`10`	`10`	`[Fact]`
`11`	`11`	`public void ConvertEscapeSequenceToEncodingName()`
`12`	`12`	`{`
`13`		`- Assert.Equal("UTF-8", Iso2022Converter.ConvertEscapeSequenceToEncodingName(new byte[] { 0x1B, 0x25, 0x47 }));`
`14`		`- //Assert.Equal("ISO-8859-1", Iso2022Converter.ConvertEscapeSequenceToEncodingName(new byte[] { 0x1B, 0x2E, 0x41 }));`
`15`		`- Assert.Equal("ISO-8859-1", Iso2022Converter.ConvertEscapeSequenceToEncodingName(new byte[] { 0x1B, 0xE2, 0x80, 0xA2, 0x41 }));`
`16`		`- Assert.Equal("ISO-8859-1", Iso2022Converter.ConvertEscapeSequenceToEncodingName(new byte[] { 0x1B, 0x2D, 0x41 }));`
`17`		`- Assert.Null(Iso2022Converter.ConvertEscapeSequenceToEncodingName(new byte[] { 1, 2, 3, 4 }));`
	`13`	`+ Assert.Equal("UTF-8", Iso2022Converter.ConvertEscapeSequenceToEncodingName([0x1B, 0x25, 0x47]));`
	`14`	`+ //Assert.Equal("ISO-8859-1", Iso2022Converter.ConvertEscapeSequenceToEncodingName([0x1B, 0x2E, 0x41]));`
	`15`	`+ Assert.Equal("ISO-8859-1", Iso2022Converter.ConvertEscapeSequenceToEncodingName([0x1B, 0xE2, 0x80, 0xA2, 0x41]));`
	`16`	`+ Assert.Equal("ISO-8859-1", Iso2022Converter.ConvertEscapeSequenceToEncodingName([0x1B, 0x2D, 0x41]));`
	`17`	`+ Assert.Null(Iso2022Converter.ConvertEscapeSequenceToEncodingName([1, 2, 3, 4]));`
`18`	`18`	`}`
`19`	`19`	`}`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public static class Iso2022Converter`
`12`	`12`	`private const byte Esc = 0x1B;`
`13`	`13`
`14`	`14`	`/// <summary>Attempts to convert the given ISO2022 escape sequence to an encoding name.</summary>`
`15`		`- public static string? ConvertEscapeSequenceToEncodingName(byte[] bytes)`
	`15`	`+ public static string? ConvertEscapeSequenceToEncodingName(ReadOnlySpan<byte> bytes)`
`16`	`16`	`{`
`17`	`17`	`if (bytes.Length > 2 && bytes[0] == Esc && bytes[1] == PercentSign && bytes[2] == LatinCapitalG)`
`18`	`18`	`return "UTF-8";`