From: Nikolai Neff Date: Sat, 6 Oct 2018 13:30:40 +0000 (+0200) Subject: add EXIF 2.31 Tags (#1338) X-Git-Tag: 7.0.8-13~48 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c1b7cc33de13406099d10f33be9fe8ea353b46b9;p=imagemagick add EXIF 2.31 Tags (#1338) Official Standard: http://www.cipa.jp/std/documents/e/DC-008-Translation-2016-E.pdf --- diff --git a/MagickCore/property.c b/MagickCore/property.c index a18390a0e..f6f944ee7 100644 --- a/MagickCore/property.c +++ b/MagickCore/property.c @@ -1093,19 +1093,28 @@ static MagickBooleanType GetEXIFProperty(const Image *image, { 0x84e3, "exif:IT8RasterPadding" }, { 0x84e5, "exif:IT8ColorTable" }, { 0x8649, "exif:ImageResourceInformation" }, - { 0x8769, "exif:ExifOffset" }, + { 0x8769, "exif:ExifOffset" }, //Documentation specs as "Exif IFD Pointer"? { 0x8773, "exif:InterColorProfile" }, { 0x8822, "exif:ExposureProgram" }, { 0x8824, "exif:SpectralSensitivity" }, - { 0x8825, "exif:GPSInfo" }, - { 0x8827, "exif:ISOSpeedRatings" }, + { 0x8825, "exif:GPSInfo" }, //Documentation specs as "GPSInfo IFD Pointer"? + { 0x8827, "exif:PhotographicSensitivity" }, { 0x8828, "exif:OECF" }, - { 0x8829, "exif:Interlace" }, + { 0x8829, "exif:Interlace" }, { 0x882a, "exif:TimeZoneOffset" }, { 0x882b, "exif:SelfTimerMode" }, + { 0x8830, "exif:SensitivityType" }, + { 0x8831, "exif:StandardOutputSensitivity" }, + { 0x8832, "exif:RecommendedExposureIndex" }, + { 0x8833, "exif:ISOSpeed" }, + { 0x8834, "exif:ISOSpeedLatitudeyyy" }, + { 0x8835, "exif:ISOSpeedLatitudezzz" }, { 0x9000, "exif:ExifVersion" }, { 0x9003, "exif:DateTimeOriginal" }, { 0x9004, "exif:DateTimeDigitized" }, + { 0x9010, "exif:OffsetTime" }, + { 0x9011, "exif:OffsetTimeOriginal" }, + { 0x9012, "exif:OffsetTimeDigitized" }, { 0x9101, "exif:ComponentsConfiguration" }, { 0x9102, "exif:CompressedBitsPerPixel" }, { 0x9201, "exif:ShutterSpeedValue" }, @@ -1121,6 +1130,10 @@ static MagickBooleanType GetEXIFProperty(const Image *image, { 0x920b, "exif:FlashEnergy" }, { 0x920c, "exif:SpatialFrequencyResponse" }, { 0x920d, "exif:Noise" }, + { 0x9214, "exif:SubjectArea" }, + { 0x9290, "exif:SubSecTime" }, + { 0x9291, "exif:SubSecTimeOriginal" }, + { 0x9292, "exif:SubSecTimeDigitized" }, { 0x9211, "exif:ImageNumber" }, { 0x9212, "exif:SecurityClassification" }, { 0x9213, "exif:ImageHistory" }, @@ -1128,19 +1141,25 @@ static MagickBooleanType GetEXIFProperty(const Image *image, { 0x9215, "exif:ExposureIndex" }, { 0x9216, "exif:TIFF-EPStandardID" }, { 0x927c, "exif:MakerNote" }, + { 0x9286, "exif:UserComment" }, + { 0x9290, "exif:SubSecTime" }, + { 0x9291, "exif:SubSecTimeOriginal" }, + { 0x9292, "exif:SubSecTimeDigitized" }, + { 0x9400, "exif:Temperature" }, + { 0x9401, "exif:Humidity" }, + { 0x9402, "exif:Pressure" }, + { 0x9403, "exif:WaterDepth" }, + { 0x9404, "exif:Acceleration" }, + { 0x9405, "exif:CameraElevationAngle" }, { 0x9C9b, "exif:WinXP-Title" }, { 0x9C9c, "exif:WinXP-Comments" }, { 0x9C9d, "exif:WinXP-Author" }, { 0x9C9e, "exif:WinXP-Keywords" }, - { 0x9C9f, "exif:WinXP-Subject" }, - { 0x9286, "exif:UserComment" }, - { 0x9290, "exif:SubSecTime" }, - { 0x9291, "exif:SubSecTimeOriginal" }, - { 0x9292, "exif:SubSecTimeDigitized" }, + { 0x9C9f, "exif:WinXP-Subject" }, { 0xa000, "exif:FlashPixVersion" }, { 0xa001, "exif:ColorSpace" }, - { 0xa002, "exif:ExifImageWidth" }, - { 0xa003, "exif:ExifImageLength" }, + { 0xa002, "exif:PixelXDimension" }, + { 0xa003, "exif:PixelYDimension" }, { 0xa004, "exif:RelatedSoundFile" }, { 0xa005, "exif:InteroperabilityOffset" }, { 0xa20b, "exif:FlashEnergy" }, @@ -1169,6 +1188,12 @@ static MagickBooleanType GetEXIFProperty(const Image *image, { 0xa40b, "exif:DeviceSettingDescription" }, { 0xa40c, "exif:SubjectDistanceRange" }, { 0xa420, "exif:ImageUniqueID" }, + { 0xa430, "exif:CameraOwnerName" }, + { 0xa431, "exif:BodySerialNumber" }, + { 0xa432, "exif:LensSpecification" }, + { 0xa433, "exif:LensMake" }, + { 0xa434, "exif:LensModel" }, + { 0xa435, "exif:LensSerialNumber" }, { 0xc4a5, "exif:PrintImageMatching" }, { 0xa500, "exif:Gamma" }, { 0xc640, "exif:CR2Slice" }, @@ -1203,6 +1228,7 @@ static MagickBooleanType GetEXIFProperty(const Image *image, { 0x1001c, "exif:GPSAreaInformation" }, { 0x1001d, "exif:GPSDateStamp" }, { 0x1001e, "exif:GPSDifferential" }, + { 0x1001f, "exif:GPSHPositioningError" }, { 0x00000, (const char *) NULL } };