Skip to content

Commit 1ae9f42

Browse files
Add camera models for NikonFl3 makernotes group (#1994)
* Add camera models for NikonFl3 * Python test for new NikonFl3 camera models
1 parent 7c8e6fc commit 1ae9f42

File tree

4 files changed

+40
-0
lines changed

4 files changed

+40
-0
lines changed

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, "0104", 0, 2, NA },
1143+
{ 0x00a8, "0105", 0, 2, NA },
11421144
{ 0x00a8, "0107", 0, 3, NA },
11431145
{ 0x00a8, "0108", 0, 3, NA },
11441146
};

test/data/pr_1994_poc1.jpg

64.2 KB
Loading

test/data/pr_1994_poc2.jpg

70.2 KB
Loading
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# -*- coding: utf-8 -*-
2+
3+
import system_tests
4+
from system_tests import CaseMeta, path
5+
6+
class TestAddModelsForNikonFl3(metaclass=CaseMeta):
7+
"""
8+
Enables NikonFl3 group to be used by more camera models
9+
"""
10+
11+
filename1 = path("$data_path/pr_1994_poc1.jpg")
12+
filename2 = path("$data_path/pr_1994_poc2.jpg")
13+
commands = ["$exiv2 --grep NikonFl3 $filename1",
14+
"$exiv2 --grep NikonFl3 $filename2"
15+
]
16+
stdout = ["""Exif.NikonFl3.Version Undefined 4 1.04
17+
Exif.NikonFl3.FlashSource Byte 1 None
18+
Exif.NikonFl3.ExternalFlashFirmware Short 1 n/a
19+
Exif.NikonFl3.ExternalFlashFlags Byte 1 Fired
20+
Exif.NikonFl3.FlashFocalLength Byte 1 n/a
21+
Exif.NikonFl3.RepeatingFlashRate Byte 1 n/a
22+
Exif.NikonFl3.RepeatingFlashCount Byte 1 n/a
23+
Exif.NikonFl3.FlashGNDistance Byte 1 None
24+
Exif.NikonFl3.FlashColorFilter Byte 1 None
25+
""",
26+
"""Exif.NikonFl3.Version Undefined 4 1.05
27+
Exif.NikonFl3.FlashSource Byte 1 None
28+
Exif.NikonFl3.ExternalFlashFirmware Short 1 n/a
29+
Exif.NikonFl3.ExternalFlashFlags Byte 1 Fired
30+
Exif.NikonFl3.FlashFocalLength Byte 1 n/a
31+
Exif.NikonFl3.RepeatingFlashRate Byte 1 n/a
32+
Exif.NikonFl3.RepeatingFlashCount Byte 1 n/a
33+
Exif.NikonFl3.FlashGNDistance Byte 1 None
34+
Exif.NikonFl3.FlashColorFilter Byte 1 None
35+
"""]
36+
stderr = [""]*2
37+
retval = [0]*2
38+

0 commit comments

Comments
 (0)