Merge pull request #2087 from Exiv2/update_canon_tags_2

Update canon tags 2
Exiv2 · Feb 16, 2022 · 287744f · 287744f
2 parents 0a135ff + 2f135f7
commit 287744f
Show file tree

Hide file tree

Showing 69 changed files with 1,737 additions and 690 deletions.
diff --git a/doc/templates/Makefile b/doc/templates/Makefile
@@ -50,10 +50,20 @@ TABLES = Exif \
          CanonSi \
          CanonCf \
          CanonPi \
+         CanonTi \
          CanonFi \
          CanonPa \
          CanonPr \
-         CanonTi \
+         CanonMe \
+         CanonHdr \
+         CanonVigCor2 \
+         CanonLiOp \
+         CanonAfMiAdj \
+         CanonLe \
+         CanonAm \
+         CanonFil \
+         CanonAfC \
+         CanonRawB \
          Casio \
          Casio2 \
          Fujifilm \

diff --git a/doc/templates/tags-canon.html.in b/doc/templates/tags-canon.html.in
@@ -39,16 +39,66 @@ __CanonCf__
 __CanonPi__
 <br>
 
-<h3>Canon File Info Tags</h3>
+<h3>Canon Filter Info Tags</h3>
 <p>Click on a column header to sort the table.</p>
 __CanonFi__
 <br>
 
+<h3>Canon High Dynamic Range Tags</h3>
+<p>Click on a column header to sort the table.</p>
+__CanonHdr__
+<br>
+
+<h3>Canon Vignetting Correction 2 Tags</h3>
+<p>Click on a column header to sort the table.</p>
+__CanonVigCor2__
+<br>
+
+<h3>Canon Lighting Option Tags</h3>
+<p>Click on a column header to sort the table.</p>
+__CanonLiOp__
+<br>
+
+<h3>Canon AF Micro Adjust Tags</h3>
+<p>Click on a column header to sort the table.</p>
+__CanonAfMiAdj__
+<br>
+
+<h3>Canon Lens Info Tags</h3>
+<p>Click on a column header to sort the table.</p>
+__CanonLe__
+<br>
+
+<h3>Canon Ambience Selection Tags</h3>
+<p>Click on a column header to sort the table.</p>
+__CanonAm__
+<br>
+
+<h3>Canon Filter Info Tags</h3>
+<p>Click on a column header to sort the table.</p>
+__CanonFil__
+<br>
+
 <h3>Canon Processing Info Tags</h3>
 <p>Click on a column header to sort the table.</p>
 __CanonPr__
 <br>
 
+<h3>Canon Multi-Exposure Tags</h3>
+<p>Click on a column header to sort the table.</p>
+__CanonMe__
+<br>
+
+<h3>Canon AF Config Tags</h3>
+<p>Click on a column header to sort the table.</p>
+__CanonAfC__
+<br>
+
+<h3>Canon Raw Burst Info Tags</h3>
+<p>Click on a column header to sort the table.</p>
+__CanonRawB__
+<br>
+
 <h3>Canon TimeInfo Tags</h3>
 <p>Click on a column header to sort the table.</p>
 __CanonTi__

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/samples/taglist.cpp b/samples/taglist.cpp
@@ -147,7 +147,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
@@ -77,8 +77,6 @@ namespace Exiv2 {
         static const TagInfo* tagListMv();
         //! Return read-only list of built-in Canon My Colors Info tags
         static const TagInfo* tagListMc();
-        //! Return read-only list of built-in Canon AFInfo3 Info tags
-        static const TagInfo* tagListAf3();
         //! Return read-only list of built-in Canon Face detection Info tags
         static const TagInfo* tagListFcd3();
         //! Return read-only list of built-in Canon White balance Info tags
@@ -123,15 +121,7 @@ namespace Exiv2 {
         static const TagInfo* tagListAfC();
         //! 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();
-
-
-
-
-
-
-
+
 
         //! @name Print functions for Canon %MakerNote tags
         //@{
@@ -182,8 +172,6 @@ namespace Exiv2 {
 
         //! Tag information
         static const TagInfo tagInfo_[];
-        static const TagInfo tagInfoAf2_[];
-        static const TagInfo tagInfoAf3_[];
         static const TagInfo tagInfoAfC_[];
         static const TagInfo tagInfoAfMiAdj_[];        
         static const TagInfo tagInfoAm_[];

diff --git a/src/exif.cpp b/src/exif.cpp
@@ -655,6 +655,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
@@ -90,6 +90,16 @@ namespace Exiv2 {
         { canonFiId,       "Makernote", "CanonFi",      CanonMakerNote::tagListFi      },
         { canonPaId,       "Makernote", "CanonPa",      CanonMakerNote::tagListPa      },
         { canonPrId,       "Makernote", "CanonPr",      CanonMakerNote::tagListPr      },
+        { 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
@@ -66,8 +66,6 @@ namespace Exiv2 {
         panaRawId,
         mnId,
         canonId,
-        canonAf2Id,
-        canonAf3Id,
         canonAfCId,
         canonAfMiAdjId,
         canonAmId,
@@ -96,7 +94,7 @@ namespace Exiv2 {
         canonTiId,
         canonFiId,
         canonPrId,
-        canonPreID,
+        canonPreID,        
         canonVigCorId,
         canonVigCor2Id,
         canonWbId,