Skip to content

Commit

Permalink
Formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
drewnoakes committed Feb 18, 2024
1 parent 49b8d47 commit 1882a43
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions MetadataExtractor/Formats/Exif/ExifTiffHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -615,7 +615,7 @@ private bool ProcessMakernote(in TiffReaderContext context, int makernoteOffset)
Directories.Add(directory);
ProcessKodakMakernote(directory, makernoteOffset, context.Reader.WithByteOrder(isMotorolaByteOrder: headerBytes.StartsWith("KDK INFO"u8)));
}
else if (cameraMake is not null && cameraMake.Equals("CANON", StringComparison.OrdinalIgnoreCase))
else if (cameraMake is not null && cameraMake.Equals("CANON", StringComparison.OrdinalIgnoreCase)) // Observed "Canon"
{
PushDirectory(new CanonMakernoteDirectory());
TiffReader.ProcessIfd(this, context, ifdOffset: makernoteOffset);
Expand All @@ -633,8 +633,7 @@ private bool ProcessMakernote(in TiffReaderContext context, int makernoteOffset)
TiffReader.ProcessIfd(this, context, ifdOffset: makernoteOffset);
}
}
else if (headerBytes.StartsWith("FUJIFILM"u8) ||
string.Equals("FUJIFILM", cameraMake, StringComparison.OrdinalIgnoreCase))
else if (headerBytes.StartsWith("FUJIFILM"u8) || string.Equals("FUJIFILM", cameraMake, StringComparison.OrdinalIgnoreCase))
{
// Note that this also applies to certain Leica cameras, such as the Digilux-4.3.
// The 4 bytes after "FUJIFILM" in the makernote point to the start of the makernote
Expand Down

0 comments on commit 1882a43

Please sign in to comment.