Skip to content

Spanify Iso2022Converter #369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions MetadataExtractor.Tests/Formats/Iptc/Iso2022ConverterTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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]));
}
}
}
2 changes: 1 addition & 1 deletion MetadataExtractor/Formats/Iptc/Iso2022Converter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion MetadataExtractor/PublicAPI/net45/PublicAPI.Shipped.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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!>!
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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!>!
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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!>!
Expand Down