From 56a455422d9fd9d1deb332ead7d49475b29e0512 Mon Sep 17 00:00:00 2001 From: Alex Esseling Date: Wed, 19 May 2021 22:28:11 +0200 Subject: [PATCH] Adding LensSerialNumber Tag --- src/tags_int.cpp | 5 +++-- src/tiffimage_int.cpp | 18 ++++++++++++++++-- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/tags_int.cpp b/src/tags_int.cpp index ee2c3755..a040142d 100644 --- a/src/tags_int.cpp +++ b/src/tags_int.cpp @@ -90,11 +90,12 @@ namespace Exiv2 { { canonFiId, "Makernote", "CanonFi", CanonMakerNote::tagListFi }, { canonPaId, "Makernote", "CanonPa", CanonMakerNote::tagListPa }, { canonPrId, "Makernote", "CanonPr", CanonMakerNote::tagListPr }, - { canonVigCor2Id, "Makernote", "CanonVigCor2", CanonMakerNote::tagListVigCor2 }, // ToDO + { canonVigCor2Id, "Makernote", "CanonVigCor2", CanonMakerNote::tagListVigCor2 }, { canonLiOpId, "Makernote", "CanonLiOp", CanonMakerNote::tagListLiOp }, { canonAfMiAdjId, "Makernote", "CanonAfMiAdj", CanonMakerNote::tagListAfMiAdj }, + { canonLeId, "Makernote", "CanonLe", CanonMakerNote::tagListLe }, { canonAmId, "Makernote", "CanonAm", CanonMakerNote::tagListAm }, - { canonFilId, "Makernote", "CanonAm", CanonMakerNote::tagListFil }, + { canonFilId, "Makernote", "CanonFil", CanonMakerNote::tagListFil }, { canonHdrId, "Makernote", "CanonHdr", CanonMakerNote::tagListHdr }, { canonMeId, "Makernote", "CanonMe", CanonMakerNote::tagListMe }, { casioId, "Makernote", "Casio", CasioMakerNote::tagList }, diff --git a/src/tiffimage_int.cpp b/src/tiffimage_int.cpp index 9d06461b..2e249c74 100644 --- a/src/tiffimage_int.cpp +++ b/src/tiffimage_int.cpp @@ -183,6 +183,19 @@ namespace Exiv2 { { 0, ttSignedLong, 1 } }; + + //! Canon LensInfo binary array - configuration + extern const ArrayCfg canonLeCfg = { + canonLeId, // Group for the elements + invalidByteOrder, // Use byte order from parent + ttSignedLong, // Type for array entry and size element + notEncrypted, // Not encrypted + true, // Has a size element + false, // No fillers + false, // Don't concatenate gaps + { 0, ttSignedLong, 1 } + }; + //! Canon Ambience Selction Info binary array - configuration extern const ArrayCfg canonAmCfg = { canonAmId, // Group for the elements @@ -1268,6 +1281,7 @@ namespace Exiv2 { { Tag::root, canonAfMiAdjId, canonId, 0x4013 }, { Tag::root, canonVigCor2Id, canonId, 0x4016 }, { Tag::root, canonLiOpId, canonId, 0x4018 }, + { Tag::root, canonLeId, canonId, 0x4019 }, { Tag::root, canonAmId, canonId, 0x4020 }, { Tag::root, canonMeId, canonId, 0x4021 }, { Tag::root, canonFilId, canonId, 0x4024 }, @@ -1633,7 +1647,7 @@ namespace Exiv2 { //{ 0x4015, canonId, EXV_SIMPLE_BINARY_ARRAY(canonVigCorCfg) }, { 0x4016, canonId, EXV_SIMPLE_BINARY_ARRAY(canonVigCor2Cfg) }, { 0x4018, canonId, EXV_SIMPLE_BINARY_ARRAY(canonLiOpCfg) }, - //{ 0x4019, canonId, EXV_SIMPLE_BINARY_ARRAY(canonLeCfg) }, + { 0x4019, canonId, EXV_SIMPLE_BINARY_ARRAY(canonLeCfg) }, { 0x4020, canonId, EXV_SIMPLE_BINARY_ARRAY(canonAmCfg) }, { 0x4021, canonId, EXV_SIMPLE_BINARY_ARRAY(canonMeCfg) }, { 0x4024, canonId, EXV_SIMPLE_BINARY_ARRAY(canonFilCfg) }, @@ -1655,7 +1669,7 @@ namespace Exiv2 { // { Tag::all, canonVigCorId, newTiffBinaryElement }, { Tag::all, canonVigCor2Id, newTiffBinaryElement }, { Tag::all, canonLiOpId, newTiffBinaryElement }, - // { Tag::all, canonLeId, newTiffBinaryElement }, + { Tag::all, canonLeId, newTiffBinaryElement }, { Tag::all, canonAmId, newTiffBinaryElement }, { Tag::all, canonMeId, newTiffBinaryElement }, { Tag::all, canonFilId, newTiffBinaryElement },