From 8d7b88053bd9624ef829d021b3604a83c71300d3 Mon Sep 17 00:00:00 2001 From: James Jackson-South Date: Sat, 25 Jan 2020 18:11:49 +1100 Subject: [PATCH] Update LenseInfo name and type to match specification --- src/ImageSharp/Metadata/Profiles/Exif/ExifTags.cs | 2 +- .../Metadata/Profiles/Exif/Tags/ExifTag.Rational.cs | 5 ----- .../Metadata/Profiles/Exif/Tags/ExifTag.RationalArray.cs | 5 +++++ src/ImageSharp/Metadata/Profiles/Exif/Tags/ExifTagValue.cs | 4 ++-- src/ImageSharp/Metadata/Profiles/Exif/Values/ExifValues.cs | 2 +- .../Metadata/Profiles/Exif/Values/ExifValuesTests.cs | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/ImageSharp/Metadata/Profiles/Exif/ExifTags.cs b/src/ImageSharp/Metadata/Profiles/Exif/ExifTags.cs index 13fff5b6ad..a4123d02fe 100644 --- a/src/ImageSharp/Metadata/Profiles/Exif/ExifTags.cs +++ b/src/ImageSharp/Metadata/Profiles/Exif/ExifTags.cs @@ -225,7 +225,7 @@ namespace SixLabors.ImageSharp.Metadata.Profiles.Exif case ExifTagValue.ImageUniqueID: case ExifTagValue.OwnerName: case ExifTagValue.SerialNumber: - case ExifTagValue.LensInfo: + case ExifTagValue.LensSpecification: case ExifTagValue.LensMake: case ExifTagValue.LensModel: case ExifTagValue.LensSerialNumber: diff --git a/src/ImageSharp/Metadata/Profiles/Exif/Tags/ExifTag.Rational.cs b/src/ImageSharp/Metadata/Profiles/Exif/Tags/ExifTag.Rational.cs index f1364b2c37..2281dee49c 100644 --- a/src/ImageSharp/Metadata/Profiles/Exif/Tags/ExifTag.Rational.cs +++ b/src/ImageSharp/Metadata/Profiles/Exif/Tags/ExifTag.Rational.cs @@ -131,11 +131,6 @@ namespace SixLabors.ImageSharp.Metadata.Profiles.Exif /// public static ExifTag DigitalZoomRatio { get; } = new ExifTag(ExifTagValue.DigitalZoomRatio); - /// - /// Gets the LensInfo exif tag. - /// - public static ExifTag LensInfo { get; } = new ExifTag(ExifTagValue.LensInfo); - /// /// Gets the GPSAltitude exif tag. /// diff --git a/src/ImageSharp/Metadata/Profiles/Exif/Tags/ExifTag.RationalArray.cs b/src/ImageSharp/Metadata/Profiles/Exif/Tags/ExifTag.RationalArray.cs index 63b10e3e22..cf43a8a8a4 100644 --- a/src/ImageSharp/Metadata/Profiles/Exif/Tags/ExifTag.RationalArray.cs +++ b/src/ImageSharp/Metadata/Profiles/Exif/Tags/ExifTag.RationalArray.cs @@ -50,5 +50,10 @@ namespace SixLabors.ImageSharp.Metadata.Profiles.Exif /// Gets the GPSDestLongitude exif tag. /// public static ExifTag GPSDestLongitude { get; } = new ExifTag(ExifTagValue.GPSDestLongitude); + + /// + /// Gets the LensSpecification exif tag. + /// + public static ExifTag LensSpecification { get; } = new ExifTag(ExifTagValue.LensSpecification); } } diff --git a/src/ImageSharp/Metadata/Profiles/Exif/Tags/ExifTagValue.cs b/src/ImageSharp/Metadata/Profiles/Exif/Tags/ExifTagValue.cs index 7268762c69..f70bcea37a 100644 --- a/src/ImageSharp/Metadata/Profiles/Exif/Tags/ExifTagValue.cs +++ b/src/ImageSharp/Metadata/Profiles/Exif/Tags/ExifTagValue.cs @@ -1356,9 +1356,9 @@ namespace SixLabors.ImageSharp.Metadata.Profiles.Exif SerialNumber = 0xA431, /// - /// LensInfo + /// LensSpecification /// - LensInfo = 0xA432, + LensSpecification = 0xA432, /// /// LensMake diff --git a/src/ImageSharp/Metadata/Profiles/Exif/Values/ExifValues.cs b/src/ImageSharp/Metadata/Profiles/Exif/Values/ExifValues.cs index b183c4ec9f..62d3f40ac2 100644 --- a/src/ImageSharp/Metadata/Profiles/Exif/Values/ExifValues.cs +++ b/src/ImageSharp/Metadata/Profiles/Exif/Values/ExifValues.cs @@ -129,7 +129,6 @@ namespace SixLabors.ImageSharp.Metadata.Profiles.Exif case ExifTagValue.FocalPlaneYResolution: return new ExifRational(ExifTag.FocalPlaneYResolution); case ExifTagValue.ExposureIndex: return new ExifRational(ExifTag.ExposureIndex); case ExifTagValue.DigitalZoomRatio: return new ExifRational(ExifTag.DigitalZoomRatio); - case ExifTagValue.LensInfo: return new ExifRational(ExifTag.LensInfo); case ExifTagValue.GPSAltitude: return new ExifRational(ExifTag.GPSAltitude); case ExifTagValue.GPSDOP: return new ExifRational(ExifTag.GPSDOP); case ExifTagValue.GPSSpeed: return new ExifRational(ExifTag.GPSSpeed); @@ -147,6 +146,7 @@ namespace SixLabors.ImageSharp.Metadata.Profiles.Exif case ExifTagValue.GPSTimestamp: return new ExifRationalArray(ExifTag.GPSTimestamp); case ExifTagValue.GPSDestLatitude: return new ExifRationalArray(ExifTag.GPSDestLatitude); case ExifTagValue.GPSDestLongitude: return new ExifRationalArray(ExifTag.GPSDestLongitude); + case ExifTagValue.LensSpecification: return new ExifRationalArray(ExifTag.LensSpecification); case ExifTagValue.OldSubfileType: return new ExifShort(ExifTag.OldSubfileType); case ExifTagValue.Compression: return new ExifShort(ExifTag.Compression); diff --git a/tests/ImageSharp.Tests/Metadata/Profiles/Exif/Values/ExifValuesTests.cs b/tests/ImageSharp.Tests/Metadata/Profiles/Exif/Values/ExifValuesTests.cs index 5d8770acf5..231ad8f0d6 100644 --- a/tests/ImageSharp.Tests/Metadata/Profiles/Exif/Values/ExifValuesTests.cs +++ b/tests/ImageSharp.Tests/Metadata/Profiles/Exif/Values/ExifValuesTests.cs @@ -122,7 +122,6 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.Exif.Values { ExifTag.FocalPlaneYResolution }, { ExifTag.ExposureIndex }, { ExifTag.DigitalZoomRatio }, - { ExifTag.LensInfo }, { ExifTag.GPSAltitude }, { ExifTag.GPSDOP }, { ExifTag.GPSSpeed }, @@ -142,7 +141,8 @@ namespace SixLabors.ImageSharp.Tests.Metadata.Profiles.Exif.Values { ExifTag.GPSLongitude }, { ExifTag.GPSTimestamp }, { ExifTag.GPSDestLatitude }, - { ExifTag.GPSDestLongitude } + { ExifTag.GPSDestLongitude }, + { ExifTag.LensSpecification } }; public static TheoryData ShortTags => new TheoryData