Exiv2 · alexvanderberkel · Aug 30, 2021 · Sep 1, 2021 · Sep 2, 2021 · Sep 2, 2021
diff --git a/doc/templates/Makefile b/doc/templates/Makefile
@@ -53,6 +53,9 @@ TABLES = Exif \
          CanonFi \
          CanonPa \
          CanonPr \
+         CanonMe \
+         CanonHdr \          
+         CanonVigCor2 \
          Casio \
          Casio2 \
          Fujifilm \

diff --git a/doc/templates/tags-canon.html.in b/doc/templates/tags-canon.html.in
@@ -44,6 +44,11 @@ __CanonPi__
 __CanonFi__
 <br>
 
+<h3>Canon File Info Tags</h3>
+<p>Click on a column header to sort the table.</p>
+__CanonHdr__
+<br>
+
 <h3>Canon Processing Info Tags</h3>
 <p>Click on a column header to sort the table.</p>
 __CanonPr__

diff --git a/man/man1/exiv2.1 b/man/man1/exiv2.1
@@ -633,7 +633,7 @@ MakerNote         CanonPi         NikonAFT      NikonPreview  OlympusFe6     Sam
 MpfInfo           CanonPr         NikonAf       NikonSi01xx   OlympusFe7
 Photo             CanonSi         NikonAf2      NikonSi02xx   OlympusFe8     Sony1
 SubImage1         CanonTi         NikonAf22     NikonSiD300a  OlympusFe9     Sony1Cs
-SubImage2                         NikonCb1      NikonSiD300b  OlympusFi      Sony1Cs2
+SubImage2         CanonHdr        NikonCb1      NikonSiD300b  OlympusFi      Sony1Cs2
 SubImage3         Casio           NikonCb2      NikonSiD40    OlympusIp      Sony1MltCs7D
 SubImage4         Casio2          NikonCb2a     NikonSiD80    OlympusRd      Sony1MltCsA100
 SubImage5                         NikonCb3      NikonVr       OlympusRd2     Sony1MltCsNew

diff --git a/samples/taglist.cpp b/samples/taglist.cpp
@@ -148,7 +148,7 @@ int main(int argc, char* argv[])
         if (rc || bHelp) {
             std::cout << "Usage: taglist [--help]"                     << std::endl
                 << "           [--group name|"                         << std::endl
-                << "            Groups|Exif|Canon|CanonCs|CanonSi|CanonCf|Fujifilm|Minolta|Nikon1|Nikon2|Nikon3|Olympus|" << std::endl
+                << "            Groups|Exif|Canon|CanonCs|CanonSi|CanonCf|CanonHdr|Fujifilm|Minolta|Nikon1|Nikon2|Nikon3|Olympus|" << std::endl
                 << "            Panasonic|Pentax|Sigma|Sony|Iptc|"                                                        << std::endl
                 << "            dc|xmp|xmpRights|xmpMM|xmpBJ|xmpTPg|xmpDM|pdf|photoshop|crs|tiff|exif|aux|iptc|all|ALL"  << std::endl
                 << "           ]"                                      << std::endl

diff --git a/src/canonmn_int.cpp b/src/canonmn_int.cpp
diff --git a/src/canonmn_int.hpp b/src/canonmn_int.hpp
@@ -124,14 +124,8 @@ namespace Exiv2 {
         //! Return read-only list of built-in Canon RawBurstInfo Info tags
         static const TagInfo* tagListRawB();
         //! Return read-only list of built-in Canon AFInfo2 Info tags
-        static const TagInfo* tagListAf2();
-
-
-
-
-
-
-
+        static const TagInfo* tagListAf2();     
+
 
         //! @name Print functions for Canon %MakerNote tags
         //@{

diff --git a/src/exif.cpp b/src/exif.cpp
@@ -684,6 +684,7 @@ namespace Exiv2 {
             "Exif.Canon.AFPointsInFocus",
             "Exif.Canon.AFPointsSelected",
             "Exif.Canon.AFPointsUnusable",
+            "Exif.Canon.AFFineRotation",
         };
         for (auto&& filteredIfd0Tag : filteredIfd0Tags) {
             auto pos = ed.findKey(ExifKey(filteredIfd0Tag));

diff --git a/src/tags_int.cpp b/src/tags_int.cpp
@@ -89,6 +89,17 @@ namespace Exiv2 {
         { canonFiId,       "Makernote", "CanonFi",      CanonMakerNote::tagListFi      },
         { canonPaId,       "Makernote", "CanonPa",      CanonMakerNote::tagListPa      },
         { canonPrId,       "Makernote", "CanonPr",      CanonMakerNote::tagListPr      },
+        { canonAf2Id,      "Makernote", "CanonAf2Id",   CanonMakerNote::tagListAf2 },
+        { 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", "CanonFil",     CanonMakerNote::tagListFil   }, 
+        { canonMeId,       "Makernote", "CanonMe",      CanonMakerNote::tagListMe      }, 
+        { canonHdrId,      "Makernote", "CanonHdr",     CanonMakerNote::tagListHdr     },         
+        { canonAfCId,      "Makernote", "CanonAfC",     CanonMakerNote::tagListAfC   },  
+        { canonRawBId,     "Makernote", "CanonRawB",    CanonMakerNote::tagListRawB   },                
         { 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
@@ -48,6 +48,7 @@ namespace Exiv2 {
         false,            // Don't concatenate gaps
         { 0, ttUnsignedShort, 1 }
     };
+
     //! Canon Camera Settings binary array - definition
     extern const ArrayDef canonCsDef[] = {
         { 46, ttUnsignedShort, 3 } // Exif.CanonCs.Lens
@@ -113,6 +114,19 @@ namespace Exiv2 {
         { 0, ttSignedLong, 1 }
     };
 
+
+         //! Canon canonAfMiAdj Info binary array - configuration
+    extern const ArrayCfg canonAf2Cfg = {
+        canonAf2Id,        // 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 File Info binary array - configuration
     extern const ArrayCfg canonFiCfg = {
         canonFiId,        // Group for the elements
@@ -141,6 +155,136 @@ namespace Exiv2 {
         { 0, ttSignedShort, 1 }
     };
 
+
+
+     //! Canon canonAfMiAdj Info binary array - configuration
+    extern const ArrayCfg canonAfMiAdjCfg = {
+        canonAfMiAdjId,        // 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 Vignetting Correction 2 Info binary array - configuration
+    extern const ArrayCfg canonVigCor2Cfg = {
+        canonVigCor2Id,        // 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 Lighting Optimization Info binary array - configuration
+    extern const ArrayCfg canonLiOpCfg = {
+        canonLiOpId,        // 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 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
+        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 MultiExposure Selction Info binary array - configuration
+    extern const ArrayCfg canonMeCfg = {
+        canonMeId,        // 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 Filter Info binary array - configuration
+    extern const ArrayCfg canonFilCfg = {
+        canonFilId,        // 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 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 }
+    };
+
+    //! Canon AF Config Info binary array - configuration
+    extern const ArrayCfg canonAfCCfg = {
+        canonAfCId,        // 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 RawBurst Info binary array - configuration
+    extern const ArrayCfg canonRawBCfg = {
+        canonRawBId,        // 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, ttUnsignedLong, 1 }
+    };
+
+
     //! Nikon Vibration Reduction binary array - configuration
     extern const ArrayCfg nikonVrCfg = {
         nikonVrId,        // Group for the elements
@@ -1046,13 +1190,24 @@ namespace Exiv2 {
         { Tag::root, fujiId,           exifId,           0x927c    },
         { Tag::root, canonId,          exifId,           0x927c    },
         { Tag::root, canonCsId,        canonId,          0x0001    },
-        { Tag::root, canonSiId,        canonId,          0x0004    },
+        { Tag::root, canonSiId,        canonId,          0x0004    },        
+        { Tag::root, canonAf2Id,       canonId,          0x0026    },
         { Tag::root, canonPaId,        canonId,          0x0005    },
         { Tag::root, canonCfId,        canonId,          0x000f    },
         { Tag::root, canonPiId,        canonId,          0x0012    },
         { Tag::root, canonTiId,        canonId,          0x0035    },
         { Tag::root, canonFiId,        canonId,          0x0093    },
-        { Tag::root, canonPrId,        canonId,          0x00a0    },
+        { Tag::root, canonPrId,        canonId,          0x00a0    },        
+        { 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    },
+        { Tag::root, canonHdrId,       canonId,          0x4025    },
+        { Tag::root, canonAfCId,       canonId,          0x4028    },
+        { Tag::root, canonRawBId,      canonId,          0x403f	   },
         { Tag::root, nikon1Id,         exifId,           0x927c    },
         { Tag::root, nikon2Id,         exifId,           0x927c    },
         { Tag::root, nikon3Id,         exifId,           0x927c    },
@@ -1398,21 +1553,45 @@ namespace Exiv2 {
         {    0x0005, canonId,          EXV_SIMPLE_BINARY_ARRAY(canonPaCfg)       },
         {    0x000f, canonId,          EXV_SIMPLE_BINARY_ARRAY(canonCfCfg)       },
         {    0x0012, canonId,          EXV_SIMPLE_BINARY_ARRAY(canonPiCfg)       },
+        {    0x0026, canonId,          EXV_SIMPLE_BINARY_ARRAY(canonAf2Cfg)      },
         {    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)       },        
+        {    0x4013, canonId,          EXV_SIMPLE_BINARY_ARRAY(canonAfMiAdjCfg)  },
+        //{    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)      },             
+        {    0x4020, canonId,          EXV_SIMPLE_BINARY_ARRAY(canonAmCfg)       },
+        {    0x4021, canonId,          EXV_SIMPLE_BINARY_ARRAY(canonMeCfg)       },
+        {    0x4024, canonId,          EXV_SIMPLE_BINARY_ARRAY(canonFilCfg)      },        
+        {    0x4025, canonId,          EXV_SIMPLE_BINARY_ARRAY(canonHdrCfg)      },
+        {    0x4028, canonId,          EXV_SIMPLE_BINARY_ARRAY(canonAfCCfg)      },        
+        {    0x403f, canonId,          EXV_SIMPLE_BINARY_ARRAY(canonRawBCfg)      },   
         { Tag::next, canonId,          ignoreTiffComponent                       },
         {  Tag::all, canonId,          newTiffEntry                              },
 
         // Canon makernote composite tags
         {  Tag::all, canonCsId,        newTiffBinaryElement                      },
         {  Tag::all, canonSiId,        newTiffBinaryElement                      },
+        {  Tag::all, canonAf2Id,        newTiffBinaryElement                      },
         {  Tag::all, canonPaId,        newTiffBinaryElement                      },
         {  Tag::all, canonCfId,        newTiffBinaryElement                      },
         {  Tag::all, canonPiId,        newTiffBinaryElement                      },
         {  Tag::all, canonTiId,        newTiffBinaryElement                      },
         {  Tag::all, canonFiId,        newTiffBinaryElement                      },
         {  Tag::all, canonPrId,        newTiffBinaryElement                      },
+        {  Tag::all, canonAfMiAdjId,   newTiffBinaryElement                      },
+       // {  Tag::all, canonVigCorId,        newTiffBinaryElement                     },
+       {  Tag::all, canonVigCor2Id,    newTiffBinaryElement                      },
+       {  Tag::all, canonLiOpId,       newTiffBinaryElement                      },
+       {  Tag::all, canonLeId,        newTiffBinaryElement                     },
+       {  Tag::all, canonAmId,         newTiffBinaryElement                      },
+       {  Tag::all, canonMeId,         newTiffBinaryElement                      },
+       {  Tag::all, canonFilId,        newTiffBinaryElement                      },       
+       {  Tag::all, canonHdrId,        newTiffBinaryElement                      },
+       {  Tag::all, canonAfCId,        newTiffBinaryElement                      },
+       {  Tag::all, canonRawBId,       newTiffBinaryElement                      },
 
         // Nikon1 makernote
         { Tag::next, nikon1Id,         ignoreTiffComponent                       },