Update canon tags

doc/templates/Makefile

@@ -53,6 +53,9 @@ TABLES = Exif \
          CanonFi \
          CanonPa \
          CanonPr \
+         CanonMe \
+         CanonHdr \          
+         CanonVigCor2 \
          Casio \
          Casio2 \
          Fujifilm \

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

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
         //@{

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));

src/tags_int.cpp

@@ -89,6 +89,10 @@ namespace Exiv2 {
         { canonFiId,       "Makernote", "CanonFi",      CanonMakerNote::tagListFi      },
         { canonPaId,       "Makernote", "CanonPa",      CanonMakerNote::tagListPa      },
         { canonPrId,       "Makernote", "CanonPr",      CanonMakerNote::tagListPr      },
+        { canonVigCor2Id,  "Makernote", "CanonVigCor2", CanonMakerNote::tagListVigCor2 }, // 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         },

src/tags_int.hpp

@@ -96,7 +96,7 @@ namespace Exiv2 {
         canonTiId,
         canonFiId,
         canonPrId,
-        canonPreID,
+        canonPreID,        
         canonVigCorId,
         canonVigCor2Id,
         canonWbId,

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
     extern const ArrayCfg nikonVrCfg = {
         nikonVrId,        // Group for the elements
@@ -1400,7 +1413,17 @@ 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)       },
+        //{    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)      },        
         { Tag::next, canonId,          ignoreTiffComponent                       },
         {  Tag::all, canonId,          newTiffEntry                              },
 
@@ -1413,6 +1436,16 @@ namespace Exiv2 {
         {  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                     },
 
         // Nikon1 makernote
         { Tag::next, nikon1Id,         ignoreTiffComponent                       },

test/data/exifdata-test.out

@@ -231,26 +231,26 @@ Exif.CanonCs.ZoomTargetWidth                  0x0025 Makernote    Short       1
 Exif.CanonCs.0x0026                           0x0026 Makernote    Short       1 0
 Exif.CanonCs.SpotMeteringMode                 0x0027 Makernote    Short       1 1
 Exif.Canon.FocalLength                        0x0002 Makernote    Short       4 2 682 286 215
-Exif.Canon.0x0003                             0x0003 Makernote    Short       4 0 0 0 0
+Exif.Canon.CanonFlashInfo                     0x0003 Makernote    Short       4 0 0 0 0
 Exif.CanonSi.0x0000                           0x0000 Makernote    Short       1 54
 Exif.CanonSi.AutoISO                          0x0001 Makernote    Short       1 0
 Exif.CanonSi.ISOSpeed                         0x0002 Makernote    Short       1 160
 Exif.CanonSi.MeasuredEV                       0x0003 Makernote    Short       1 276
 Exif.CanonSi.TargetAperture                   0x0004 Makernote    Short       1 149
 Exif.CanonSi.TargetShutterSpeed               0x0005 Makernote    Short       1 287
-Exif.CanonSi.0x0006                           0x0006 Makernote    Short       1 0
+Exif.CanonSi.ExposureCompensation             0x0006 Makernote    Short       1 0
 Exif.CanonSi.WhiteBalance                     0x0007 Makernote    Short       1 0
 Exif.CanonSi.SlowShutter                      0x0008 Makernote    Short       1 0
 Exif.CanonSi.Sequence                         0x0009 Makernote    Short       1 0
-Exif.CanonSi.0x000a                           0x000a Makernote    Short       1 6
+Exif.CanonSi.OpticalZoomCode                  0x000a Makernote    Short       1 6
 Exif.CanonSi.0x000b                           0x000b Makernote    Short       1 0
 Exif.CanonSi.CameraTemperature                0x000c Makernote    Short       1 0
 Exif.CanonSi.FlashGuideNumber                 0x000d Makernote    Short       1 0
 Exif.CanonSi.AFPointUsed                      0x000e Makernote    Short       1 12290
 Exif.CanonSi.FlashBias                        0x000f Makernote    Short       1 0
 Exif.CanonSi.AutoExposureBracketing           0x0010 Makernote    Short       1 0
-Exif.CanonSi.0x0011                           0x0011 Makernote    Short       1 0
-Exif.CanonSi.0x0012                           0x0012 Makernote    Short       1 1
+Exif.CanonSi.AEBBracketValue                  0x0011 Makernote    Short       1 0
+Exif.CanonSi.ControlMode                      0x0012 Makernote    Short       1 1
 Exif.CanonSi.SubjectDistance                  0x0013 Makernote    Short       1 782
 Exif.CanonSi.0x0014                           0x0014 Makernote    Short       1 0
 Exif.CanonSi.ApertureValue                    0x0015 Makernote    Short       1 149
@@ -360,26 +360,26 @@ Exif.CanonCs.ZoomTargetWidth                  0x0025 Makernote    Short       1
 Exif.CanonCs.0x0026                           0x0026 Makernote    Short       1 0
 Exif.CanonCs.SpotMeteringMode                 0x0027 Makernote    Short       1 1
 Exif.Canon.FocalLength                        0x0002 Makernote    Short       4 2 682 286 215
-Exif.Canon.0x0003                             0x0003 Makernote    Short       4 0 0 0 0
+Exif.Canon.CanonFlashInfo                     0x0003 Makernote    Short       4 0 0 0 0
 Exif.CanonSi.0x0000                           0x0000 Makernote    Short       1 54
 Exif.CanonSi.AutoISO                          0x0001 Makernote    Short       1 0
 Exif.CanonSi.ISOSpeed                         0x0002 Makernote    Short       1 160
 Exif.CanonSi.MeasuredEV                       0x0003 Makernote    Short       1 276
 Exif.CanonSi.TargetAperture                   0x0004 Makernote    Short       1 149
 Exif.CanonSi.TargetShutterSpeed               0x0005 Makernote    Short       1 287
-Exif.CanonSi.0x0006                           0x0006 Makernote    Short       1 0
+Exif.CanonSi.ExposureCompensation             0x0006 Makernote    Short       1 0
 Exif.CanonSi.WhiteBalance                     0x0007 Makernote    Short       1 0
 Exif.CanonSi.SlowShutter                      0x0008 Makernote    Short       1 0
 Exif.CanonSi.Sequence                         0x0009 Makernote    Short       1 0
-Exif.CanonSi.0x000a                           0x000a Makernote    Short       1 6
+Exif.CanonSi.OpticalZoomCode                  0x000a Makernote    Short       1 6
 Exif.CanonSi.0x000b                           0x000b Makernote    Short       1 0
 Exif.CanonSi.CameraTemperature                0x000c Makernote    Short       1 0
 Exif.CanonSi.FlashGuideNumber                 0x000d Makernote    Short       1 0
 Exif.CanonSi.AFPointUsed                      0x000e Makernote    Short       1 12290
 Exif.CanonSi.FlashBias                        0x000f Makernote    Short       1 0
 Exif.CanonSi.AutoExposureBracketing           0x0010 Makernote    Short       1 0
-Exif.CanonSi.0x0011                           0x0011 Makernote    Short       1 0
-Exif.CanonSi.0x0012                           0x0012 Makernote    Short       1 1
+Exif.CanonSi.AEBBracketValue                  0x0011 Makernote    Short       1 0
+Exif.CanonSi.ControlMode                      0x0012 Makernote    Short       1 1
 Exif.CanonSi.SubjectDistance                  0x0013 Makernote    Short       1 782
 Exif.CanonSi.0x0014                           0x0014 Makernote    Short       1 0
 Exif.CanonSi.ApertureValue                    0x0015 Makernote    Short       1 149
@@ -490,26 +490,26 @@ Exif.CanonCs.ZoomTargetWidth                  0x0025 Makernote    Short       1
 Exif.CanonCs.0x0026                           0x0026 Makernote    Short       1 0
 Exif.CanonCs.SpotMeteringMode                 0x0027 Makernote    Short       1 1
 Exif.Canon.FocalLength                        0x0002 Makernote    Short       4 2 682 286 215
-Exif.Canon.0x0003                             0x0003 Makernote    Short       4 0 0 0 0
+Exif.Canon.CanonFlashInfo                     0x0003 Makernote    Short       4 0 0 0 0
 Exif.CanonSi.0x0000                           0x0000 Makernote    Short       1 54
 Exif.CanonSi.AutoISO                          0x0001 Makernote    Short       1 0
 Exif.CanonSi.ISOSpeed                         0x0002 Makernote    Short       1 160
 Exif.CanonSi.MeasuredEV                       0x0003 Makernote    Short       1 276
 Exif.CanonSi.TargetAperture                   0x0004 Makernote    Short       1 149
 Exif.CanonSi.TargetShutterSpeed               0x0005 Makernote    Short       1 287
-Exif.CanonSi.0x0006                           0x0006 Makernote    Short       1 0
+Exif.CanonSi.ExposureCompensation             0x0006 Makernote    Short       1 0
 Exif.CanonSi.WhiteBalance                     0x0007 Makernote    Short       1 0
 Exif.CanonSi.SlowShutter                      0x0008 Makernote    Short       1 0
 Exif.CanonSi.Sequence                         0x0009 Makernote    Short       1 0
-Exif.CanonSi.0x000a                           0x000a Makernote    Short       1 6
+Exif.CanonSi.OpticalZoomCode                  0x000a Makernote    Short       1 6
 Exif.CanonSi.0x000b                           0x000b Makernote    Short       1 0
 Exif.CanonSi.CameraTemperature                0x000c Makernote    Short       1 0
 Exif.CanonSi.FlashGuideNumber                 0x000d Makernote    Short       1 0
 Exif.CanonSi.AFPointUsed                      0x000e Makernote    Short       1 12290
 Exif.CanonSi.FlashBias                        0x000f Makernote    Short       1 0
 Exif.CanonSi.AutoExposureBracketing           0x0010 Makernote    Short       1 0
-Exif.CanonSi.0x0011                           0x0011 Makernote    Short       1 0
-Exif.CanonSi.0x0012                           0x0012 Makernote    Short       1 1
+Exif.CanonSi.AEBBracketValue                  0x0011 Makernote    Short       1 0
+Exif.CanonSi.ControlMode                      0x0012 Makernote    Short       1 1
 Exif.CanonSi.SubjectDistance                  0x0013 Makernote    Short       1 782
 Exif.CanonSi.0x0014                           0x0014 Makernote    Short       1 0
 Exif.CanonSi.ApertureValue                    0x0015 Makernote    Short       1 149
@@ -620,26 +620,26 @@ Exif.CanonCs.ZoomTargetWidth                  0x0025 Makernote    Short       1
 Exif.CanonCs.0x0026                           0x0026 Makernote    Short       1 0
 Exif.CanonCs.SpotMeteringMode                 0x0027 Makernote    Short       1 1
 Exif.Canon.FocalLength                        0x0002 Makernote    Short       4 2 682 286 215
-Exif.Canon.0x0003                             0x0003 Makernote    Short       4 0 0 0 0
+Exif.Canon.CanonFlashInfo                     0x0003 Makernote    Short       4 0 0 0 0
 Exif.CanonSi.0x0000                           0x0000 Makernote    Short       1 54
 Exif.CanonSi.AutoISO                          0x0001 Makernote    Short       1 0
 Exif.CanonSi.ISOSpeed                         0x0002 Makernote    Short       1 160
 Exif.CanonSi.MeasuredEV                       0x0003 Makernote    Short       1 276
 Exif.CanonSi.TargetAperture                   0x0004 Makernote    Short       1 149
 Exif.CanonSi.TargetShutterSpeed               0x0005 Makernote    Short       1 287
-Exif.CanonSi.0x0006                           0x0006 Makernote    Short       1 0
+Exif.CanonSi.ExposureCompensation             0x0006 Makernote    Short       1 0
 Exif.CanonSi.WhiteBalance                     0x0007 Makernote    Short       1 0
 Exif.CanonSi.SlowShutter                      0x0008 Makernote    Short       1 0
 Exif.CanonSi.Sequence                         0x0009 Makernote    Short       1 0
-Exif.CanonSi.0x000a                           0x000a Makernote    Short       1 6
+Exif.CanonSi.OpticalZoomCode                  0x000a Makernote    Short       1 6
 Exif.CanonSi.0x000b                           0x000b Makernote    Short       1 0
 Exif.CanonSi.CameraTemperature                0x000c Makernote    Short       1 0
 Exif.CanonSi.FlashGuideNumber                 0x000d Makernote    Short       1 0
 Exif.CanonSi.AFPointUsed                      0x000e Makernote    Short       1 12290
 Exif.CanonSi.FlashBias                        0x000f Makernote    Short       1 0
 Exif.CanonSi.AutoExposureBracketing           0x0010 Makernote    Short       1 0
-Exif.CanonSi.0x0011                           0x0011 Makernote    Short       1 0
-Exif.CanonSi.0x0012                           0x0012 Makernote    Short       1 1
+Exif.CanonSi.AEBBracketValue                  0x0011 Makernote    Short       1 0
+Exif.CanonSi.ControlMode                      0x0012 Makernote    Short       1 1
 Exif.CanonSi.SubjectDistance                  0x0013 Makernote    Short       1 782
 Exif.CanonSi.0x0014                           0x0014 Makernote    Short       1 0
 Exif.CanonSi.ApertureValue                    0x0015 Makernote    Short       1 149