Browse Source

Update LenseInfo name and type to match specification

pull/1093/head
James Jackson-South 6 years ago
parent
commit
8d7b88053b
  1. 2
      src/ImageSharp/Metadata/Profiles/Exif/ExifTags.cs
  2. 5
      src/ImageSharp/Metadata/Profiles/Exif/Tags/ExifTag.Rational.cs
  3. 5
      src/ImageSharp/Metadata/Profiles/Exif/Tags/ExifTag.RationalArray.cs
  4. 4
      src/ImageSharp/Metadata/Profiles/Exif/Tags/ExifTagValue.cs
  5. 2
      src/ImageSharp/Metadata/Profiles/Exif/Values/ExifValues.cs
  6. 4
      tests/ImageSharp.Tests/Metadata/Profiles/Exif/Values/ExifValuesTests.cs

2
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:

5
src/ImageSharp/Metadata/Profiles/Exif/Tags/ExifTag.Rational.cs

@ -131,11 +131,6 @@ namespace SixLabors.ImageSharp.Metadata.Profiles.Exif
/// </summary>
public static ExifTag<Rational> DigitalZoomRatio { get; } = new ExifTag<Rational>(ExifTagValue.DigitalZoomRatio);
/// <summary>
/// Gets the LensInfo exif tag.
/// </summary>
public static ExifTag<Rational> LensInfo { get; } = new ExifTag<Rational>(ExifTagValue.LensInfo);
/// <summary>
/// Gets the GPSAltitude exif tag.
/// </summary>

5
src/ImageSharp/Metadata/Profiles/Exif/Tags/ExifTag.RationalArray.cs

@ -50,5 +50,10 @@ namespace SixLabors.ImageSharp.Metadata.Profiles.Exif
/// Gets the GPSDestLongitude exif tag.
/// </summary>
public static ExifTag<Rational[]> GPSDestLongitude { get; } = new ExifTag<Rational[]>(ExifTagValue.GPSDestLongitude);
/// <summary>
/// Gets the LensSpecification exif tag.
/// </summary>
public static ExifTag<Rational[]> LensSpecification { get; } = new ExifTag<Rational[]>(ExifTagValue.LensSpecification);
}
}

4
src/ImageSharp/Metadata/Profiles/Exif/Tags/ExifTagValue.cs

@ -1356,9 +1356,9 @@ namespace SixLabors.ImageSharp.Metadata.Profiles.Exif
SerialNumber = 0xA431,
/// <summary>
/// LensInfo
/// LensSpecification
/// </summary>
LensInfo = 0xA432,
LensSpecification = 0xA432,
/// <summary>
/// LensMake

2
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);

4
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<ExifTag> ShortTags => new TheoryData<ExifTag>

Loading…
Cancel
Save