xymp
/
exiv2
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adding LensSerialNumber Tag

Browse Source
main
Alex Esseling 4 years ago committed by Luis Diaz
parent e3311b9a4f
commit 56a455422d
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File

5
src/tags_int.cpp
Unescape Escape View File

@ -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 },

18
src/tiffimage_int.cpp
Unescape Escape View File

@ -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 },

Write Preview
Loading…
Cancel
Save