From f41e7e59e3478173c4fc585305966445cbaf8754 Mon Sep 17 00:00:00 2001 From: Alex Esseling Date: Mon, 10 May 2021 22:31:08 +0200 Subject: [PATCH] second rund --- doc/templates/Makefile | 4 +++- man/man1/exiv2.1 | 12 ++++++------ src/tags_int.cpp | 4 +++- src/tags_int.hpp | 2 +- src/tiffimage_int.cpp | 17 ++++++++++++++++- 5 files changed, 29 insertions(+), 10 deletions(-) diff --git a/doc/templates/Makefile b/doc/templates/Makefile index 4b2b242207..cabd1aafff 100644 --- a/doc/templates/Makefile +++ b/doc/templates/Makefile @@ -53,7 +53,9 @@ TABLES = Exif \ CanonFi \ CanonPa \ CanonPr \ - CanonTi \ + CanonMe \ + CanonHdr \ + CanonVigCor2 \ Casio \ Casio2 \ Fujifilm \ diff --git a/man/man1/exiv2.1 b/man/man1/exiv2.1 index dea9ce3afc..d5d621d3c8 100644 --- a/man/man1/exiv2.1 +++ b/man/man1/exiv2.1 @@ -1,6 +1,6 @@ -The Exiv2 manpage is available online. -.sp 1 -.nf -Latest release: https://www.exiv2.org/manpage.html -Github 'main': https://github.com/Exiv2/exiv2/blob/main/exiv2.md -.fi \ No newline at end of file +The Exiv2 manpage is available online. +.sp 1 +.nf +Latest release: https://www.exiv2.org/manpage.html +Github 'main': https://github.com/Exiv2/exiv2/blob/main/exiv2.md +.fi diff --git a/src/tags_int.cpp b/src/tags_int.cpp index 3b150f936d..b15e201735 100644 --- a/src/tags_int.cpp +++ b/src/tags_int.cpp @@ -91,7 +91,9 @@ namespace Exiv2 { { canonPaId, "Makernote", "CanonPa", CanonMakerNote::tagListPa }, { canonPrId, "Makernote", "CanonPr", CanonMakerNote::tagListPr }, { canonVigCor2Id, "Makernote", "CanonVigCor2", CanonMakerNote::tagListVigCor2 }, // new - { canonAfMiAdjId, "Makernote", "CanonAfMiAdjId", CanonMakerNote::tagListAfMiAdj }, // new + { canonAfMiAdjId, "Makernote", "CanonAfMiAdj", CanonMakerNote::tagListAfMiAdj }, // new + { canonHdrId, "Makernote", "CanonHdr", CanonMakerNote::tagListHdr }, // new + { canonMeId, "Makernote", "CanonMe", CanonMakerNote::tagListMe }, // new { casioId, "Makernote", "Casio", CasioMakerNote::tagList }, { casio2Id, "Makernote", "Casio2", Casio2MakerNote::tagList }, { fujiId, "Makernote", "Fujifilm", FujiMakerNote::tagList }, diff --git a/src/tags_int.hpp b/src/tags_int.hpp index 20727ad44c..05c6f3487d 100644 --- a/src/tags_int.hpp +++ b/src/tags_int.hpp @@ -96,7 +96,7 @@ namespace Exiv2 { canonTiId, canonFiId, canonPrId, - canonPreID, + canonPreID, canonVigCorId, canonVigCor2Id, canonWbId, diff --git a/src/tiffimage_int.cpp b/src/tiffimage_int.cpp index ae8681a1d2..90c6764b52 100644 --- a/src/tiffimage_int.cpp +++ b/src/tiffimage_int.cpp @@ -141,6 +141,19 @@ namespace Exiv2 { { 0, ttSignedShort, 1 } }; + //! Canon Hdr Info binary array - configuration + extern const ArrayCfg canonHdrCfg = { + canonHdrId, // 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 } + }; + + //! Nikon Vibration Reduction binary array - configuration constexpr ArrayCfg nikonVrCfg = { nikonVrId, // Group for the elements @@ -1531,7 +1544,8 @@ namespace Exiv2 { { 0x0012, canonId, EXV_SIMPLE_BINARY_ARRAY(canonPiCfg) }, { 0x0035, canonId, EXV_SIMPLE_BINARY_ARRAY(canonTiCfg) }, { 0x0093, canonId, EXV_BINARY_ARRAY(canonFiCfg, canonFiDef) }, - { 0x00a0, canonId, EXV_SIMPLE_BINARY_ARRAY(canonPrCfg) }, + { 0x00a0, canonId, EXV_SIMPLE_BINARY_ARRAY(canonPrCfg) }, + { 0x4025, canonId, EXV_SIMPLE_BINARY_ARRAY(canonHdrCfg) }, { Tag::next, canonId, ignoreTiffComponent }, { Tag::all, canonId, newTiffEntry }, @@ -1544,6 +1558,7 @@ namespace Exiv2 { { Tag::all, canonTiId, newTiffBinaryElement }, { Tag::all, canonFiId, newTiffBinaryElement }, { Tag::all, canonPrId, newTiffBinaryElement }, + { Tag::all, canonHdrId, newTiffBinaryElement }, // Nikon1 makernote { Tag::next, nikon1Id, ignoreTiffComponent },