Merge pull request #1963 from postscript-dev/add_FlashInfo0107_makernote_group

Add NikonFl7 makernotes group

Author: kevinbackhouse

doc/templates/Makefile

@@ -76,6 +76,7 @@ TABLES = Exif \
          NikonFl1 \
          NikonFl2 \
          NikonFl3 \
+         NikonFl7 \
          NikonSiD80 \
          NikonSiD40 \
          NikonSiD300a \

doc/templates/tags-nikon.html.in

@@ -91,6 +91,11 @@ __NikonFl2__
 __NikonFl3__
 <br>
 
+<h3>Nikon Flash Info 7 Tags (for version 0107 and 0108)</h3>
+<p>Click on a column header to sort the table.</p>
+__NikonFl7__
+<br>
+
 <h3>Nikon Shot Info D80 Tags</h3>
 <p>Click on a column header to sort the table.</p>
 __NikonSiD80__

exiv2.md

@@ -793,19 +793,19 @@ Image      CanonCf       Nikon2     NikonPc       OlympusFe9      SonyMisc3c
 Image2     CanonCs       Nikon3     NikonPreview  OlympusFi       SonyMinolta
 Image3     CanonFi       NikonAFT   NikonSi01xx   OlympusIp       SonySInfo1
 Iop        CanonPa       NikonAf    NikonSi02xx   OlympusRd
-MakerNote  CanonPi       NikonAf    NikonSiD300a  OlympusRd2      Samsung2
-MpfInfo    CanonPr       NikonAf2   NikonSiD300b  OlympusRi       SamsungPictureWizard
-Photo      CanonSi       NikonAf22  NikonSiD40    SamsungPreview
-SubImage1  CanonTi       NikonCb1   NikonSiD80    Sigma	
-SubImage2                NikonCb2   NikonVr
-SubImage3  Casio         NikonCb2a  NikonWt       Sony1
-SubImage4  Casio2        NikonCb2b                Sony1Cs
-SubImage5                NikonCb3   Olympus       Sony1Cs2
-SubImage6  Minolta       NikonCb4   Olympus2      Sony1MltCs7D
-SubImage7  MinoltaCs5D   NikonFi    OlympusCs     Sony1MltCsA100
-SubImage8  MinoltaCs7D   NikonFl1   OlympusEq     Sony1MltCsNew
-SubImage9  MinoltaCsNew  NikonFl2   OlympusFe1    Sony1MltCsOld
-SubThumb1  MinoltaCsOld  NikonFl3   OlympusFe2    Sony2
+MakerNote  CanonPi       NikonAf2   NikonSiD300a  OlympusRd2      Samsung2
+MpfInfo    CanonPr       NikonAf22  NikonSiD300b  OlympusRi       SamsungPictureWizard
+Photo      CanonSi       NikonCb1   NikonSiD40    SamsungPreview
+SubImage1  CanonTi       NikonCb2   NikonSiD80    Sigma	
+SubImage2                NikonCb2a  NikonVr
+SubImage3  Casio         NikonCb2b  NikonWt       Sony1
+SubImage4  Casio2        NikonCb3                 Sony1Cs
+SubImage5                NikonCb4   Olympus       Sony1Cs2
+SubImage6  Minolta       NikonFi    Olympus2      Sony1MltCs7D
+SubImage7  MinoltaCs5D   NikonFl1   OlympusCs     Sony1MltCsA100
+SubImage8  MinoltaCs7D   NikonFl2   OlympusEq     Sony1MltCsNew
+SubImage9  MinoltaCsNew  NikonFl3   OlympusFe1    Sony1MltCsOld
+SubThumb1  MinoltaCsOld  NikonFl7   OlympusFe2    Sony2
 Thumbnail                NikonIi    OlympusFe3    Sony2Cs
            Panasonic     NikonLd1   OlympusFe4    Sony2Cs2
 Pentax     PanasonicRaw  NikonLd2   OlympusFe5    Sony2010e

src/makernote_int.cpp

@@ -1139,6 +1139,8 @@ namespace Exiv2 {
         { 0x00a8, "0101",    0, 0,  NA },
         { 0x00a8, "0102",    0, 1,  NA },
         { 0x00a8, "0103",    0, 2,  NA },
+        { 0x00a8, "0107",    0, 3,  NA },
+        { 0x00a8, "0108",    0, 3,  NA },
     };
 
     int nikonSelector(uint16_t tag, const byte* pData, uint32_t size, TiffComponent* const /*pRoot*/)