second rund

Exiv2 · Feb 14, 2022 · f41e7e5 · f41e7e5
1 parent 2329306
commit f41e7e5
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 10 deletions.
diff --git 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
@@ -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
+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
@@ -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
@@ -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
@@ -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                       },