Skip to content

Commit 7c8e6fc

Browse files
Merge pull request #1963 from postscript-dev/add_FlashInfo0107_makernote_group
Add NikonFl7 makernotes group
2 parents b95e19e + 562b10f commit 7c8e6fc

File tree

12 files changed

+442
-40
lines changed

12 files changed

+442
-40
lines changed

doc/templates/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ TABLES = Exif \
7676
NikonFl1 \
7777
NikonFl2 \
7878
NikonFl3 \
79+
NikonFl7 \
7980
NikonSiD80 \
8081
NikonSiD40 \
8182
NikonSiD300a \

doc/templates/tags-nikon.html.in

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,11 @@ __NikonFl2__
9191
__NikonFl3__
9292
<br>
9393

94+
<h3>Nikon Flash Info 7 Tags (for version 0107 and 0108)</h3>
95+
<p>Click on a column header to sort the table.</p>
96+
__NikonFl7__
97+
<br>
98+
9499
<h3>Nikon Shot Info D80 Tags</h3>
95100
<p>Click on a column header to sort the table.</p>
96101
__NikonSiD80__

exiv2.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -793,19 +793,19 @@ Image CanonCf Nikon2 NikonPc OlympusFe9 SonyMisc3c
793793
Image2 CanonCs Nikon3 NikonPreview OlympusFi SonyMinolta
794794
Image3 CanonFi NikonAFT NikonSi01xx OlympusIp SonySInfo1
795795
Iop CanonPa NikonAf NikonSi02xx OlympusRd
796-
MakerNote CanonPi NikonAf NikonSiD300a OlympusRd2 Samsung2
797-
MpfInfo CanonPr NikonAf2 NikonSiD300b OlympusRi SamsungPictureWizard
798-
Photo CanonSi NikonAf22 NikonSiD40 SamsungPreview
799-
SubImage1 CanonTi NikonCb1 NikonSiD80 Sigma
800-
SubImage2 NikonCb2 NikonVr
801-
SubImage3 Casio NikonCb2a NikonWt Sony1
802-
SubImage4 Casio2 NikonCb2b Sony1Cs
803-
SubImage5 NikonCb3 Olympus Sony1Cs2
804-
SubImage6 Minolta NikonCb4 Olympus2 Sony1MltCs7D
805-
SubImage7 MinoltaCs5D NikonFi OlympusCs Sony1MltCsA100
806-
SubImage8 MinoltaCs7D NikonFl1 OlympusEq Sony1MltCsNew
807-
SubImage9 MinoltaCsNew NikonFl2 OlympusFe1 Sony1MltCsOld
808-
SubThumb1 MinoltaCsOld NikonFl3 OlympusFe2 Sony2
796+
MakerNote CanonPi NikonAf2 NikonSiD300a OlympusRd2 Samsung2
797+
MpfInfo CanonPr NikonAf22 NikonSiD300b OlympusRi SamsungPictureWizard
798+
Photo CanonSi NikonCb1 NikonSiD40 SamsungPreview
799+
SubImage1 CanonTi NikonCb2 NikonSiD80 Sigma
800+
SubImage2 NikonCb2a NikonVr
801+
SubImage3 Casio NikonCb2b NikonWt Sony1
802+
SubImage4 Casio2 NikonCb3 Sony1Cs
803+
SubImage5 NikonCb4 Olympus Sony1Cs2
804+
SubImage6 Minolta NikonFi Olympus2 Sony1MltCs7D
805+
SubImage7 MinoltaCs5D NikonFl1 OlympusCs Sony1MltCsA100
806+
SubImage8 MinoltaCs7D NikonFl2 OlympusEq Sony1MltCsNew
807+
SubImage9 MinoltaCsNew NikonFl3 OlympusFe1 Sony1MltCsOld
808+
SubThumb1 MinoltaCsOld NikonFl7 OlympusFe2 Sony2
809809
Thumbnail NikonIi OlympusFe3 Sony2Cs
810810
Panasonic NikonLd1 OlympusFe4 Sony2Cs2
811811
Pentax PanasonicRaw NikonLd2 OlympusFe5 Sony2010e

src/makernote_int.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1139,6 +1139,8 @@ namespace Exiv2 {
11391139
{ 0x00a8, "0101", 0, 0, NA },
11401140
{ 0x00a8, "0102", 0, 1, NA },
11411141
{ 0x00a8, "0103", 0, 2, NA },
1142+
{ 0x00a8, "0107", 0, 3, NA },
1143+
{ 0x00a8, "0108", 0, 3, NA },
11421144
};
11431145

11441146
int nikonSelector(uint16_t tag, const byte* pData, uint32_t size, TiffComponent* const /*pRoot*/)

0 commit comments

Comments
 (0)